summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Faster searchfaster_project_searchValery Sizov2016-11-084-18/+33
* Merge branch 'sh-bump-omniauth-gitlab' into 'master' Robert Speicher2016-11-083-3/+7
|\
| * Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2sh-bump-omniauth-gitlabStan Hu2016-11-073-3/+7
* | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-0826-60/+230
|\ \
| * | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-0722-59/+184
| * | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-0712-34/+79
* | | Merge branch 'todos-filter-empty-state' into 'master' Sean McGivern2016-11-082-9/+17
|\ \ \
| * | | Changed helper method to check for none on paramsPhil Hughes2016-11-082-6/+6
| * | | Fixed todos empty state when filteringtodos-filter-empty-statePhil Hughes2016-11-072-8/+16
* | | | Merge branch 'dz-fix-project-index' into 'master' Sean McGivern2016-11-083-3/+24
|\ \ \ \
| * | | | Fix 404 when visit /projects pagedz-fix-project-indexDmitriy Zaporozhets2016-11-071-0/+1
| * | | | Add tests for project#index routingDmitriy Zaporozhets2016-11-071-0/+20
| * | | | Fix project indexDmitriy Zaporozhets2016-11-071-3/+3
* | | | | Merge branch 'fix-systemhook-api' into 'master' Rémy Coutable2016-11-083-1/+11
|\ \ \ \ \
| * | | | | API: Return 400 when creating a systemhook failsRobert Schilling2016-11-083-1/+11
* | | | | | Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' in...Sean McGivern2016-11-087-14/+33
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Refactor method nameHiroyuki Sato2016-11-081-2/+2
| * | | | | Fix bug of json request urlHiroyuki Sato2016-11-072-4/+11
| * | | | | Remove 'extended_sha1' option from ExtractsPath moduleHiroyuki Sato2016-11-063-13/+10
| * | | | | Update changelogHiroyuki Sato2016-11-062-34/+4
| * | | | | Fix spinach testHiroyuki Sato2016-11-062-1/+5
| * | | | | Add a CHANGELOG entryHiroyuki Sato2016-11-061-0/+34
| * | | | | Separete a very long lineHiroyuki Sato2016-11-061-1/+3
| * | | | | Network page appear with an error message when entering nonexistent git revisionHiroyuki Sato2016-11-064-5/+10
| |/ / / /
* | | | | Merge branch 'change-docs-trigger-id' into 'master' Achilleas Pipinellis2016-11-071-1/+1
|\ \ \ \ \
| * | | | | Replace trigger with the new ID of the docs projectAchilleas Pipinellis2016-11-071-1/+1
* | | | | | Merge branch '17492-link-contrast' into 'master' Annabel Dunstone Gray2016-11-074-16/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 17492 Update link color for more accessible contrast17492-link-contrasttauriedavis2016-11-074-16/+16
|/ / / / /
* | | | | Merge branch '23036-replace-git-blame-spinach-tests-with-rspec-feature-tests'...Rémy Coutable2016-11-074-29/+25
|\ \ \ \ \
| * | | | | Rewritten spinach git_blame tests to rspec feature testsLisanne Fellinger2016-11-074-29/+25
| |/ / / /
* | | | | Merge branch '21664-incorrect-workhorse-version-number-displayed' into 'master' Rémy Coutable2016-11-074-1/+35
|\ \ \ \ \
| * | | | | Use the Gitlab Workhorse HTTP header in the admin dashboard21664-incorrect-workhorse-version-number-displayedChris Wright2016-11-074-1/+35
* | | | | | Merge branch 'cs-upgrade-redis-actionpack' into 'master' Rémy Coutable2016-11-072-17/+17
|\ \ \ \ \ \
| * | | | | | Upgrade redis-rails from 4.0.0 to 5.0.1.cs-upgrade-redis-actionpackConnor Shea2016-11-042-17/+17
* | | | | | | Merge branch 'add-api-label-id' into 'master' Sean McGivern2016-11-074-90/+111
|\ \ \ \ \ \ \
| * | | | | | | Expose Label id to APIRares Sfirlogea2016-11-074-90/+111
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'process-commits-using-sidekiq' into 'master' Robert Speicher2016-11-0719-59/+565
|\ \ \ \ \ \ \
| * | | | | | | Process commits in a separate workerprocess-commits-using-sidekiqYorick Peterse2016-11-0711-51/+251
| * | | | | | | Added IssueCollectionYorick Peterse2016-11-076-8/+127
| * | | | | | | Flush Housekeeping data from Redis specsYorick Peterse2016-11-071-0/+7
| * | | | | | | Add the method ExternalIssue#project_idYorick Peterse2016-11-072-1/+16
| * | | | | | | Add User#projects_with_reporter_access_limited_toYorick Peterse2016-11-072-0/+46
| * | | | | | | Added tests for IssuePolicyYorick Peterse2016-11-071-0/+119
* | | | | | | | Merge branch 'missing-raw-snippet-access-spec' into 'master' Sean McGivern2016-11-073-59/+151
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add missing security specs for raw snippet accessthe-undefined2016-11-053-59/+151
* | | | | | | | Merge branch '23034-speed-up-testenv-set-repo-refs' into 'master' Yorick Peterse2016-11-071-13/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Use `git update-ref --stdin -z` to speed up TestEnv.set_repo_refsNick Thomas2016-11-071-13/+11
* | | | | | | | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-0716-82/+408
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove unused 'require'Jacob Vosmaer2016-11-041-1/+0
| * | | | | | | Refine Git garbage collectionJacob Vosmaer2016-11-0416-82/+409