Commit Graph
22044 Commits
Author SHA1 Message Date
Douwe Maan 89620ddcf5 Add Repository#is_ancestor? convenience method. 2015-11-11 16:41:00 +01:00
Douwe Maan f27d841894 Tweak code formatting. 2015-11-11 16:40:59 +01:00
Douwe Maan 519f24f595 Move import form to partial. 2015-11-11 16:40:30 +01:00
Douwe Maan 1f79d0e08a Fix redirect after import fails. 2015-11-11 16:40:30 +01:00
Douwe Maan 2551d69ff8 Add Project#safe_import_url helper. 2015-11-11 16:40:30 +01:00
Douwe Maan 6a4cbc1b0a Store and show reason why import failed. 2015-11-11 16:40:30 +01:00
Douwe Maan d09c563199 Add import_error to project. 2015-11-11 16:40:30 +01:00
Sytse Sijbrandij 87ce149d93 Link blog post 2015-11-07 00:26:06 +00:00
Valery Sizov 10d8f0ae26 Merge branch 'group_visibility' into ee_master 2015-11-06 14:44:42 +02:00
Robert Speicher 6381d9e1b7 Merge branch 'improve_jira_issue_closing' into 'master'
Improve JIRA issue closing

- Zendesk ticket: https://gitlab.zendesk.com/agent/tickets/11034

### Expected behavior

When a merge request has 'Fixes JIRA-1234' in the description the issue should not only be transitioned but also record a comment (regardless of workflow type in JIRA).

### Observed behavior

Depending on the configured workflow a comment may or may not be allowed while transitioning to a new state. In my testing the newest JIRA default workflow did not allow comments while transitioning to 'Done', for example. The 'classic' workflow does, though. 

This merge request splits the transition and comment in to two API calls. The advantage is that the comment will be recorded 100% of the time instead of it being dependent on the workflow configuration.

Also, JIRA returns a '204' response code when the transition is successful. I added '204' to the success conditional because we were generating an error in the current configuration even though the transition was successful.

See merge request !45
2015-11-06 04:47:21 +00:00
Drew Blessing 5828de0a63 Improve JIRA issue closing 2015-11-05 20:00:50 -06:00
Valery Sizov d5a92b4cea Visible group option 2015-11-05 19:05:47 +02:00
Dmitriy Zaporozhets 7680ada300 Merge branch 'ce_upsteram' into 'master'
CE upsteram



See merge request !48
2015-11-05 16:29:28 +00:00
Valery Sizov b9e5448126 Merge branch 'update_changelog4' into 'master'
Update changelog



See merge request !49
2015-11-05 16:11:05 +00:00
Valery Sizov 455d3cc93e update changelog 2015-11-05 16:08:48 +00:00
Valery Sizov 3f6101aae5 test fix 2015-11-05 16:33:56 +02:00
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02:00
Valery Sizov 4f574388fc Merge branch 'public_groups' into 'master'
Allow groups to appear in the search results if the group owner allows it

https://dev.gitlab.org/gitlab/gitlabhq/issues/2565

See merge request !1751
2015-11-05 11:45:58 +00:00
Valery Sizov 6051c28fc0 Allow groups to appear in the search results if the group owner allows it 2015-11-05 13:18:51 +02:00
Dmitriy Zaporozhets 363900a3e7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-05 09:53:16 +01:00
Achilleas Pipinellis 97f9157de9 Merge branch 'update-ci-settings' into 'master'
update example of regex for pytest-cov



See merge request !1745
2015-11-05 06:42:00 +00:00
Robert Schilling cf70e64955 Merge pull request #9805 from mutec/patch-1
fixed typo in installation manual
2015-11-04 23:12:26 +01:00
Sytse Sijbrandij 95da91a66d Use single spaces 2015-11-04 17:07:21 +00:00
mutec 07821839d0 Update installation.md 2015-11-04 17:49:23 +01:00
Robert Speicher 5df6b0b758 Merge branch 'facebook-auth' into 'master'
Add Facebook authentication

See merge request !1740
2015-11-04 15:23:38 +00:00
Douwe Maan 3f05c22f56 Merge branch 'rs-git-bin-path' into 'master'
Replace all usages of `git` command with configurable binary path

Closes #3311

See merge request !1742
2015-11-04 15:03:16 +00:00
Stan Hu 82aa54193f Merge branch 'fix-infinite-redirect' into 'master'
Only redirect to homepage url when its not the root url

It was possible to create an infi redirect when the user set up the
`home_page_url` to redirect to the main URL of the gitlab instance.

This fix makes sure this redirect is not possible.

Fixes #1020 

/cc @dblessing 

See merge request !1703
2015-11-04 14:53:35 +00:00
Dmitriy Zaporozhets e59852c406 Merge branch 'improve-profile-page' into 'master'
Improvements to profile page UI

* add separator between tabs
* show project avatars
* fix tooltip offset on user calendar
* remove gray hover for tabs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #3042

See merge request !1747
2015-11-04 14:19:09 +00:00
Dmitriy Zaporozhets c5d637b2ca Improvements to profile page UI
* add separator between tabs
* show project avatars
* fix tooltip offset on user calendar
* remove gray hover for tabs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-04 14:13:25 +01:00
Yorick Peterse 6d91ee0095 Merge branch 'create-project-performance' into 'master'
Improve performance of creating projects



See merge request !1650
2015-11-04 10:14:30 +00:00
Yorick Peterse 219f920c64 Merge branch 'remove-duplicate-orders' into 'master'
Remove duplicate orders

This changes the default order from `created_at DESC, id DESC` to just `id DESC` as this achieves the same results without the overhead of having to sort data twice (we've seen queries go from 200ms to just a few ms by removing the double sort).

cc @jacobvosmaer @dzaporozhets @rspeicher @DouweM 

See merge request !1735
2015-11-04 10:14:08 +00:00
Dmitriy Zaporozhets 31a81b5cba Merge branch 'rs-update-stamp' into 'master'
Bump stamp to ~> 0.6.0

Closes #2801

See merge request !1732
2015-11-04 09:33:38 +00:00
mozillazg 5f94e130d1 update example of regex for pytest-cov 2015-11-04 11:41:44 +08:00
Robert Speicher d09d62b6b8 Replace all usages of git command with configurable binary path
Closes #3311
2015-11-03 17:11:09 -05:00
Robert Speicher 312375ac7c Update Shell Commands doc for configurable git binary path 2015-11-03 17:10:17 -05:00
Robert Speicher 05eb9e7884 Minor reformatting for Facebook integration doc
[ci skip]
2015-11-03 16:16:30 -05:00
Douwe Maan 98dcad2762 Use proper labels for OAuth providers 2015-11-03 17:59:07 +01:00
Douwe Maan 4773d98e83 Add Facebook authentication 2015-11-03 17:59:07 +01:00
Robert Speicher 700909d567 Bump stamp to ~> 0.6.0
Closes #2801
2015-11-03 11:48:05 -05:00
Dmitriy Zaporozhets 482a17089f Merge branch 'improve-profile-page' 2015-11-03 17:33:29 +01:00
Robert Speicher cc40c7af4d Merge branch 'spread-runner-last-updated-at' into 'master'
Spread out runner contacted_at updates

This is meant to prevent having too many concurrent UPDATE requests
caused by runners checking in.

See merge request !1722
2015-11-03 16:14:42 +00:00
Dmitriy Zaporozhets ef6f6f80ec Add extra padding between user description and links on profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 16:42:02 +01:00
Dmitriy Zaporozhets e0edc01d14 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 16:39:09 +01:00
Dmitriy Zaporozhets a74aba01b2 Merge branch 'fix-clipboard-btn' into 'master'
Fix clipboard button overflow

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1739
2015-11-03 15:18:05 +00:00
Dmitriy Zaporozhets 7d0d60d324 Merge branch 'go-to-nav' 2015-11-03 15:52:27 +01:00
Dmitriy Zaporozhets 00ac792cfb Fix clipboard button overflow
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 15:44:52 +01:00
Dmitriy Zaporozhets 4d7f00fdea Apply new design for user profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 15:32:40 +01:00
Kamil Trzciński 77ef4855e0 Merge branch 'drop-old-builds' into 'master'
Cleanup stuck CI builds

Fixes #3143

/cc @dzaporozhets @jacobvosmaer 

See merge request !1655
2015-11-03 13:56:43 +00:00
Valery Sizov b12e17ff55 Merge branch 'web_hook_repo_changes' 2015-11-03 15:05:50 +02:00
Dmitriy Zaporozhets ab129f7b23 Improve profile page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 14:00:41 +01:00