summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Small UI improvements to merge request pagesmall-ui-improvementsDmitriy Zaporozhets2015-11-066-5/+12
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use single spacesSytse Sijbrandij2015-11-041-0/+2
|
* Merge branch 'facebook-auth' into 'master' Robert Speicher2015-11-0412-14/+125
|\ | | | | | | | | Add Facebook authentication See merge request !1740
| * Minor reformatting for Facebook integration docfacebook-authRobert Speicher2015-11-031-13/+14
| | | | | | | | [ci skip]
| * Use proper labels for OAuth providersDouwe Maan2015-11-031-1/+8
| |
| * Add Facebook authenticationDouwe Maan2015-11-0311-13/+116
| |
* | Merge branch 'rs-git-bin-path' into 'master' Douwe Maan2015-11-0412-36/+46
|\ \ | | | | | | | | | | | | | | | | | | Replace all usages of `git` command with configurable binary path Closes #3311 See merge request !1742
| * | Replace all usages of `git` command with configurable binary pathrs-git-bin-pathRobert Speicher2015-11-0311-31/+31
| | | | | | | | | | | | Closes #3311
| * | Update Shell Commands doc for configurable git binary pathRobert Speicher2015-11-031-5/+15
| |/
* | Merge branch 'fix-infinite-redirect' into 'master' Stan Hu2015-11-041-7/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Only redirect to homepage url when its not the root urlJeroen van Baarsen2015-11-021-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Merge branch 'improve-profile-page' into 'master' Dmitriy Zaporozhets2015-11-045-9/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Improvements to profile page UIimprove-profile-pageDmitriy Zaporozhets2015-11-045-9/+26
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | | Merge branch 'create-project-performance' into 'master' Yorick Peterse2015-11-044-2/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of creating projects See merge request !1650
| * | | Removed extra activity update for new projectscreate-project-performanceYorick Peterse2015-10-291-2/+0
| | | | | | | | | | | | | | | | | | | | When a project is created the last activity timestamp is already set so there's no need for another update.
| * | | Added benchmark for Projects::CreateServiceYorick Peterse2015-10-291-0/+28
| | | | | | | | | | | | | | | | | | | | This benchmark currently runs at ~0.6 iterations per second and is unlikely to perform any better any time soon.
| * | | Added index on services.templateYorick Peterse2015-10-292-0/+6
| | | | | | | | | | | | | | | | | | | | This column is queried when creating a new project, without an index this query would lead to a sequence scan.
* | | | Merge branch 'remove-duplicate-orders' into 'master' Yorick Peterse2015-11-043-11/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fixed User sorting specsremove-duplicate-ordersYorick Peterse2015-11-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | The descriptions were not accurate and one particular spec seemingly expected the wrong User row to be returned.
| * | | | Only sort by IDs by defaultYorick Peterse2015-11-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting by both "created_at" and "id" in descending order is not needed as simply sorting by "id" in descending order will already sort rows from new to old. Depending on the query and data involved sorting twice can also introduce significant overhead.
| * | | | Added benchmark for User.allYorick Peterse2015-11-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | This benchmark exists to test if ordering has any noticeable impact in the test environment.
* | | | | Merge branch 'rs-update-stamp' into 'master' Dmitriy Zaporozhets2015-11-042-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Bump stamp to ~> 0.6.0 Closes #2801 See merge request !1732
| * | | | Bump stamp to ~> 0.6.0rs-update-stampRobert Speicher2015-11-032-3/+3
|/ / / / | | | | | | | | | | | | Closes #2801
* | | | Merge branch 'improve-profile-page'Dmitriy Zaporozhets2015-11-039-50/+109
|\ \ \ \
| * | | | Add extra padding between user description and links on profile pageDmitriy Zaporozhets2015-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix testsDmitriy Zaporozhets2015-11-032-5/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Apply new design for user profile pageDmitriy Zaporozhets2015-11-036-33/+59
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve profile page UIDmitriy Zaporozhets2015-11-032-11/+38
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'spread-runner-last-updated-at' into 'master' Robert Speicher2015-11-032-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵spread-runner-last-updated-atJacob Vosmaer2015-11-0327-150/+347
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | spread-runner-last-updated-at
| * | | | | Add changelog entry for contacted_atJacob Vosmaer2015-11-021-0/+3
| | | | | |
| * | | | | Spread out runner contacted_at updatesJacob Vosmaer2015-11-021-1/+3
| | | | | |
* | | | | | Merge branch 'fix-clipboard-btn' into 'master' Dmitriy Zaporozhets2015-11-031-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clipboard button overflow Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1739
| * | | | | | Fix clipboard button overflowDmitriy Zaporozhets2015-11-031-0/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'go-to-nav'Dmitriy Zaporozhets2015-11-039-16/+17
|\ \ \ \ \ \
| * | | | | | Better name for up-level linksgo-to-navDmitriy Zaporozhets2015-11-039-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'drop-old-builds' into 'master' Kamil Trzciński2015-11-033-0/+63
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup stuck CI builds Fixes #3143 /cc @dzaporozhets @jacobvosmaer See merge request !1655
| * | | | | | | Cleanup stuck CI builds dailydrop-old-buildsKamil Trzcinski2015-11-033-0/+63
| | | | | | | |
* | | | | | | | Merge branch 'web_hook_repo_changes'Valery Sizov2015-11-034-3/+42
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add added, modified and removed properties to commit object in webhookweb_hook_repo_changesValery Sizov2015-11-034-3/+42
| | | | | | | |
* | | | | | | | Merge branch 'only-syntax' into 'master' Kamil Trzciński2015-11-035-111/+269
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend yml syntax for only and except to support specifying repository path This allows to limit execution of jobs to specific repository. For example: ```yaml job: only: - branches@gitlab-org/gitlab-ce except: - master@gitlab-org/gitlab-ce ``` The above will run `job` for all branches on `gitlab-org/gitlab-ce`, except master. @dzaporozhets @JobV @vsizov Please review. See merge request !1720
| * | | | | | | Fix testsonly-syntaxKamil Trzcinski2015-11-031-15/+11
| | | | | | | |
| * | | | | | | SpellingKamil Trzcinski2015-11-021-1/+1
| | | | | | | |
| * | | | | | | Extend yml syntax for only and except to support specifying repository pathKamil Trzcinski2015-11-025-111/+273
| | | | | | | |
* | | | | | | | Merge branch 'fix-inflector' into 'master' Dmitriy Zaporozhets2015-11-033-23/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inflector rule that makes commits uncountable Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Before: ``` >> "commits".singularize => "commits" >> "commit".pluralize => “commits” ``` After: ``` >> "commits".singularize => "commit" >> "commit".pluralize => “commits” ``` cc @rspeicher See merge request !1726
| * | | | | | | Fix code that depends on incorrect inflector behaviorDmitriy Zaporozhets2015-11-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Remove inflector rule that makes commits uncountableDmitriy Zaporozhets2015-11-031-21/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'olhado/gitlab-ce-commit-search'Dmitriy Zaporozhets2015-11-0310-6/+52
|\ \ \ \ \ \ \
| * | | | | | | Fix commits search for empty repositoryDmitriy Zaporozhets2015-11-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Refactor search by commits messageolhado/gitlab-ce-commit-searchDmitriy Zaporozhets2015-11-027-41/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>