| Age | Commit message (Collapse) | Author |
|---|
|
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1948
|
|
Fix 2FA authentication spoofing
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Closes #13957
|
|
Fix project destroy callback
See gitlab-org/gitlab-ee!107.
See merge request !2307
|
|
Generate builds when creating tag using web interface
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4296
See merge request !2366
|
|
Use WOFF versions of SourceSansPro
See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023
See merge request !2357
|
|
https://gitlab.com/stanhu/gitlab-ce
|
|
Fix Error 500 when visiting build page of project with nil runners_token
Properly ensure that the token exists and add defensively check for a
non-nil value.
Closes #4294
See merge request !2294
|
|
Do not call API if there is no API URL
Fixes #5878
CE users may not be interested in the new JIRA features. In this case,
we should detect they haven't set an API URL and fallback to the
behavior pre-8.3. This patch does that very easily.
There are planned improvements to JIRA in future releases such as
gitlab-org/gitlab-ce#5541 which will make this more configurable.
See merge request !2341
|
|
Suppress e-mails on failed builds if allow_failure is set
Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`.
@ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away.
See merge request !2178
|
|
Get "Merge when build succeeds" to work when commits were pushed to MR
target branch while builds were running
The Merge when build succeeds service only merges when the MR is
mergeable (open, not WIP, no conflicts).
When the target branch is updated, all affected MRs have their merge
status set to `unchecked`, and the conflicts check will only happen
when `check_if_can_be_merged` is called, which happens when the MR page
is viewed.
When someone enables the automatic merge, the target branch is updated,
no-one views the MR page again, and the build succeeds, the mergeability
check will fail and the MR will not in fact be merged.
This MR makes sure `check_if_can_be_merged` is always called when MR
mergeability is checked.
See merge request !2304
|
|
Better support for referencing and closing issues in asana_service.rb (by @mikew1)
See merge request !2302
|
|
SentNotification need use `record_note` method to save right noteable
|
|
Enable "Add key" button when user fills in a proper key
Closes #4295
See merge request !2208
|
|
Fix project transfer e-mail sending incorrect paths in e-mail notification
The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race
condition where the mailer would be invoked before the project was committed
to the database, causing the transfer e-mail notification to show the old
path instead of the new one.
Closes #4670
See merge request !2235
|
|
Fixes problem with user autocomplete URI
```
Failed to load resource: net::ERR_NAME_NOT_RESOLVED
http://autocomplete/users.json?search=&per_page=20&active=true¤t_user=false
```
Fixes #4118, #4136
See merge request !2136
|
|
Hotfix for builds trace data integrity
Closes #4246
See merge request !2224
|
|
|
|
|
|
Add support for Google reCAPTCHA in user registration to prevent spammers
See merge request !2216
|
|
Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll
`git` doesn't work properly when `--follow` and `--skip` are specified together. We could even be **omitting commits in the Web log** as a result.
Here are the gory details. Let's say you ran:
```
git log -n=5 --skip=2 README
```
This is the working case since it omits `--follow`. This is what happens:
1. `git` starts at `HEAD` and traverses down the tree until it finds the top-most commit relevant to README.
2. Once this is found, this commit is returned via `get_revision_1()`.
3. If the `skip_count` is positive, decrement and repeat step 2. Otherwise go onto step 4.
4. `show_log()` gets called with that commit.
5. Repeat step 1 until we have all five entries.
That's exactly what we want. What happens when you use `--follow`? You have to understand how step 1 is performed:
* When you specify a pathspec on the command-line (e.g. README), a flag `prune` [gets set here](https://github.com/git/git/blob/master/revision.c#L2351).
* If the `prune` flag is active, `get_commit_action()` determines whether the commit should be [scanned for matching paths](https://github.com/git/git/blob/master/revision.c#L2989).
* In the case of `--follow`, however, `prune` is [disabled here](https://github.com/git/git/blob/master/revision.c#L2350).
* As a result, a commit is never scanned for matching paths and therefore never pruned. `HEAD` will always get returned as the first commit, even if it's not relevant to the README.
* Making matters worse, the `--skip` in the example above would actually skip a every other entry after `HEAD` N times. If README were changed in these skipped commits, we would actually miss information!
Since git uses a matching algorithm to determine whether a file was renamed, I
believe `git` needs to generate a diff of each commit to do this and traverse
each commit one-by-one to do this. I think that's the rationale for disabling
the `prune` functionality since you can't just do a simple string comparison.
Closes #4181, #4229, #3574, #2410
See merge request !2210
|
|
Fix Error 500 when global milestones have slashes
* Closes #4226
* Closes https://github.com/gitlabhq/gitlabhq/issues/9921
See merge request !2182
|
|
Fix identity and user retrieval when special characters are used
Fixes #4023
I also added tests to make sure the user with special characters in his name is returned correctly.
@rspeicher this probably should be added to 8.3 as a patch.
See merge request !2176
|
|
Fix Error 500 when doing a search in dashboard before visiting any project
If a search turned up an issue, under certain conditions you would see this error:
```
ActionView::Template::Error (undefined method `path_with_namespace' for nil:NilClass):
6: - if issue.description.present?
7: .description.term
8: = preserve do
9: = search_md_sanitize(markdown(issue.description))
10: %span.light
11: #{issue.project.name_with_namespace}
12: - if issue.closed?
lib/gitlab/markdown/upload_link_filter.rb:36:in `build_url'
lib/gitlab/markdown/upload_link_filter.rb:31:in `process_link_attr'
lib/gitlab/markdown/upload_link_filter.rb:18:in `block in call'
lib/gitlab/markdown/upload_link_filter.rb:17:in `call'
lib/gitlab/markdown.rb:127:in `gfm'
lib/gitlab/markdown.rb:24:in `render'
app/helpers/gitlab_markdown_helper.rb:61:in `markdown'
app/views/search/results/_issue.html.haml:9:in `block in _app_views_search_results__issue_html_haml__4127460390996300432_59973760'
app/views/search/results/_issue.html.haml:8:in `_app_views_search_results__issue_html_haml__4127460390996300432_59973760'
app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__589475855773452465_61761440'
app/views/search/show.html.haml:5:in `_app_views_search_show_html_haml___1852335078065998536_69780120'
```
Confirmed this is issue still happens in GitLab 8.4, and it also happens on GitLab.com. Here's how to reproduce:
1. Login in a new browser.
2. Enter a search term on the top right that will land a hit in the "Issues" (e.g. GitLab).
3. Click on "Issues" tab. You should get an Error 500.
The issue is that @project isn't assigned to anything.
See merge request !2110
|
|
Fix method that ensures authentication token
Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database.
This closes #4235.
See merge request !2185
|
|
Fix and test leave project display
The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing.
This fixes the display and also adds 2 different tests for it.
cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you!
See merge request !2166
|
|
Fix MR 500 when viewing the MR page
Fixes #2712
See merge request !2167
|
|
Allow admin to create new user identities
Fixes #2442
See merge request !2077
|
|
Fix issue related cross-project MRs
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4188
See merge request !2163
|
|
Allow account unlock via email
We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.
See merge request !2049
|
|
|
|
Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled
Fixes #3827
Fixes #4157
/cc @grzesiek @dblessing
See merge request !2139
|
|
Do not display project group/name when issue and MR are in same project
I noticed that things seem a bit cluttered for related merge requests
when displaying the group/project name for every item, even when it's
in the same project.
For merge requests that are in the same project as the issue we probably
don't need to display the 'in group / name' bit.
See merge request !2141
|
|
Remove extra spaces after branchname
See merge request !2152
|
|
Fix merge-request-reopen button title
Closes #4069
See merge request !2147
|
|
|
|
Closes #4069
|
|
|
|
|
|
the builds are enabled
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Move MR Builds tab next to Commits
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4132
@dzaporozhets We've got two people who feel strongly about this now, @sytses filed an issue for it :)
See merge request !2128
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Link to correct (source) project on MR builds tab
Used to link to `gitlab-org/gitlab-ce/commits/<branch-name>`, now links to correct project.
See merge request !2115
|
