Commit Graph
2194 Commits
Author SHA1 Message Date
Douwe Maan c7d9e7806a Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master'
Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL;

https://github.com/gitlabhq/gitlabhq/pull/9964

@DouweM

See merge request !2383
2016-01-13 14:21:32 +00:00
Jason Lee 710659fc1f Add changelog 2016-01-13 22:08:59 +08:00
Greg Smethells c73d55e1be enable milestone filter to stick 2016-01-12 13:18:05 -06:00
Jacob Vosmaer 1c46ab040d Add CHANGELOG entry for 8.3.4 2016-01-12 17:10:07 +01:00
Dmitriy Zaporozhets e85faec90e Merge branch 'show-ip-addresses' into 'master'
Add user's last used IP addresses to admin page

This would help admins figure out from where spam is originating.

Screenshot:

![image](/uploads/984005a3a35b7004bd0a363081eb53ba/image.png)


See merge request !2381
2016-01-12 11:44:40 +00:00
Yorick Peterse 9f8510b329 Updated CHANGELOG with changes I made
I forgot to add these in the respective MRs.

[ci skip]
2016-01-12 11:36:59 +01:00
Stan Hu 75123458ee Add user's last used IP addresses to admin page
This would help admins figure out from where spam is originating.
2016-01-12 00:59:29 -08:00
Dmitriy Zaporozhets c4511a1234 Merge branch 'update-fog' into 'master'
Bump fog to 1.36.0

Updates AWS regions and fixes a number of bugs. Tested a GitLab AWS backup without any issues.

Closes #4231

See merge request !2373
2016-01-12 08:57:08 +00:00
Robert Speicher f2fab27a56 Update CHANGELOG
[ci skip]
2016-01-11 15:18:07 -05:00
Robert Speicher 6fc1aba4a3 Merge branch 'fix/ci-linter-sequence-validations' into 'master'
Allow subsequent validations in CI Linter

Closes #5851

See merge request !2368
2016-01-11 19:09:09 +00:00
Robert Speicher 5dad714df6 Merge branch 'fix-ci-builds-for-tags' into 'master'
Generate builds when creating tag using web interface

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4296

See merge request !2366
2016-01-11 17:53:06 +00:00
Stan Hu e34c621ea1 Bump fog to 1.36.0
Closes #4231
2016-01-11 08:41:11 -08:00
Drew Blessing 67aa0b8c4c Optimize LDAP and add a search timeout 2016-01-11 08:17:32 -06:00
Grzegorz Bizon cdd3a80682 Allow subsequent validations in CI Linter
Closes #5851
2016-01-11 13:37:31 +01:00
Dmitriy Zaporozhets f41b535ced Merge branch 'fix-build-status-caching' into 'master'
Fix caching issue where build status was not updating in project dashboard

The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable.

Closes #3268

See merge request !2353
2016-01-11 12:10:33 +00:00
Kamil Trzcinski 31b66aa75e Generate builds when creating tag using web interface 2016-01-11 12:37:27 +01:00
Dmitriy Zaporozhets e04e957bd6 Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce 2016-01-11 10:17:27 +01:00
Jeroen Nijhof 706255b926 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-11 09:32:35 +01:00
Stan Hu b7aa13a0cf Before project save ensure that a runners_token exists 2016-01-10 18:12:47 -08:00
Stan Hu 4b4fdf58c7 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
2016-01-10 18:12:47 -08:00
Robert Speicher 4de89291a3 Merge branch 'fix_jira_shortterm' into 'master'
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
2016-01-10 22:12:10 +00:00
Stan Hu a8b444953b Add CHANGELOG entry for reply-by-email fix
[ci skip]
2016-01-09 17:08:49 -08:00
Stan Hu d5c8f1fdde Fix caching issue where build status was not updating in project dashboard
Closes #3268
2016-01-08 16:08:10 -08:00
Robert Speicher 99eb647087 Add a CHANGELOG entry for The Most Important Feature of All Time(TM)
Also, Open Graph data, if you're into that kind of thing.

[ci skip]
2016-01-08 15:46:55 -05:00
Stan Hu 7403df6ca7 Merge branch 'suppress-allow-failure-builds' into 'master'
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
2016-01-08 17:31:35 +00:00
Jeroen Nijhof e0436005af Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-08 17:25:09 +01:00
Drew Blessing c1e974ed88 Merge branch 'issue_3076' into 'master'
Fix problem with projects ending with .keys #3076

Closes #3076

Move route `:username.keys` below project's routes. This allow project's to handle names ending with `.keys`

See merge request !1883
2016-01-08 15:52:05 +00:00
Dmitriy Zaporozhets b64ec38aae Merge branch 'api-delete-tag' into 'master'
Delete tag via API

### What does this MR do?

Implements deleting a tag via the API.

### Are there points in the code the reviewer needs to double check?

On success, it returns the name of the deleted tag. This is similar to the [delete branch API](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/api/branches.rb#L111).

###  What are the relevant issue numbers / Feature requests?

* This MR closes #1575 
* Closes http://feedback.gitlab.com/forums/176466-general/suggestions/6599203-delete-tags-through-the-api

@stanhu Could you do a review?

See merge request !1862
2016-01-08 13:47:42 +00:00
Jeroen Nijhof 2c37ae2f0a Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-08 13:22:30 +01:00
Dmitriy Zaporozhets 08213ed4f5 Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master'
Accept 2xx status codes for successful Web hook triggers

Closes https://github.com/gitlabhq/gitlabhq/issues/9956

See merge request !2332
2016-01-08 10:56:39 +00:00
Robert Schilling 4c90ed52fe Delete tag via API 2016-01-08 10:10:04 +01:00
Stan Hu 423d2d621a Fix duplicated branch creation/deletion events when using Web UI
When deleting a branch, this is what was happening:

1. DeleteBranchService calls EventCreateService and creates an event.
2. The call to repository.rm_branch triggers the GitHooksService.
3. This, in turn, calls GitPushService and then calls EventCreateService again.

5145706c now makes it no longer necessary for DeleteBranchService and CreateBranchService to create an event.

Closes #4304
2016-01-08 00:37:41 -08:00
Stan Hu 3c58b89b0e Give credit to user who created find file feature
[ci skip]
2016-01-07 18:34:00 -08:00
Drew Blessing f7fdcb95da Do not call API if there is no API URL 2016-01-07 16:23:42 -06:00
Robert Speicher b1539116f6 Merge branch 'task-list-class' into 'master'
Properly set task-list class on single item task lists

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4193

See merge request !2330
2016-01-07 20:10:07 +00:00
Robert Speicher 90510f0037 Merge branch 'milestone-ref' into 'master'
Link to milestone in "Milestone changed" system note

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4141

See merge request !2203
2016-01-07 19:22:43 +00:00
Stan Hu 69209612e1 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 benchmarks and other specs that have `allow_failure` set to `true`.
2016-01-07 10:45:39 -08:00
Douwe Maan 79938744a8 Merge branch 'master' into task-list-class 2016-01-07 15:52:58 +01:00
Douwe Maan c3865bda02 Properly set task-list class on single item task lists 2016-01-07 15:52:34 +01:00
Stan Hu 8386edafd1 Accept 2xx status codes for successful Web hook triggers
Closes https://github.com/gitlabhq/gitlabhq/issues/9956
2016-01-07 06:28:24 -08:00
Dmitriy Zaporozhets 0456855911 Add CHANGELOG item and tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:11 +01:00
Douwe Maan 9f268708df Merge branch 'find-file-credit' into 'master'
Credit koreamic for creating Find File



See merge request !2327
2016-01-07 13:10:50 +00:00
Jeroen Nijhof 1695063d15 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-07 13:58:19 +01:00
Dmitriy Zaporozhets 8d0886d6d0 Merge branch 'fix-missing-day-in-network-graph' into 'master'
Fix missing date of month in network graph when commits span a month

Closes #3635, #1383

Before:

![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png)

After:

![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png)


See merge request !2325
2016-01-07 12:10:57 +00:00
Douwe Maan 15d689abae Credit koreamic for creating Find File 2016-01-07 13:04:09 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Douwe Maan b38eabdaf6 Fix changelog 2016-01-07 12:10:35 +01:00
Stan Hu 7d013f7848 Fix missing date of month in network graph when commits span a month
Closes #3635, #1383
2016-01-06 21:05:46 -08:00
Robert Speicher b93744e300 Merge branch 'merge-when-build-succeeds-unchecked' into 'master'
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
2016-01-06 18:58:10 +00:00
Jeroen Nijhof bde76f62fc Added CHANGELOG for housekeeping and changed GITLAB_SHELL_VERSION to 2.6.10 2016-01-06 15:57:49 +01:00