summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use Grape DSL to document methods and their paramsrc-members-services-based-on-18583Rémy Coutable2016-09-083-98/+80
* New AccessRequestsFinderRémy Coutable2016-09-087-6/+124
* Improve Members::DestroyServiceRémy Coutable2016-09-088-74/+131
* New Members::ApproveAccessRequestServiceRémy Coutable2016-09-084-12/+120
* New Members::RequestAccessServiceRémy Coutable2016-09-0811-62/+123
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-083-1/+6
|\
| * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-083-1/+5
| |\
| | * Merge branch 'fix/gitlab-export-confidential' into 'master' Rémy Coutable2016-09-053-1/+5
| | |\
| | | * Fixed gitlab.com importer missing confidential attributeJames Lopez2016-09-053-1/+5
| | |/
* | | Merge branch 'awards-control-margin' into 'master' Annabel Dunstone Gray2016-09-084-7/+8
|\ \ \
| * | | fix padding top/bottomawards-control-margintauriedavis2016-09-071-1/+1
| * | | minor refactortauriedavis2016-09-071-5/+2
| * | | fix margin for multi-line emojistauriedavis2016-09-073-1/+7
| * | | fix margin for awards-control buttonstauriedavis2016-09-062-3/+1
* | | | Merge branch 'dz-mr-version-compare' into 'master' Douwe Maan2016-09-0810-32/+147
|\ \ \ \
| * | | | Refactor compared_diff_version method in merge requests controllerdz-mr-version-compareDmitriy Zaporozhets2016-09-071-6/+2
| * | | | Refactor merge request version compare featureDmitriy Zaporozhets2016-09-073-9/+11
| * | | | Improve merge request version featureDmitriy Zaporozhets2016-09-076-41/+42
| * | | | Expand abbreviations in merge request version path helperDmitriy Zaporozhets2016-09-072-4/+4
| * | | | Add changelog entry and documentation for merge request versions compareDmitriy Zaporozhets2016-09-072-0/+7
| * | | | Refactor code for merge request version compare featureDmitriy Zaporozhets2016-09-072-47/+60
| * | | | Add more tests for merge request versions featureDmitriy Zaporozhets2016-09-072-3/+26
| * | | | Improve merge request version switch/compare dropdownDmitriy Zaporozhets2016-09-074-39/+65
| * | | | Compare merge request version against other version on changes pageDmitriy Zaporozhets2016-09-073-13/+34
| * | | | Add link to compare merge request versionsDmitriy Zaporozhets2016-09-072-0/+26
* | | | | Merge branch 'enable-rspec-formatter' into 'master' Kamil Trzciński2016-09-081-1/+1
|\ \ \ \ \
| * | | | | Add color to rspec outputenable-rspec-formatterStan Hu2016-08-201-1/+1
| * | | | | Enable rspec documentation formatterStan Hu2016-08-201-1/+1
* | | | | | Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-bu...Douwe Maan2016-09-086-71/+125
|\ \ \ \ \ \
| * | | | | | Optimize discussion notes resolving and unresolving21109-discussion-resolve-runs-a-single-update-query-per-note-but-should-run-a-single-update-query-for-all-notes-insteadAlejandro Rodríguez2016-09-066-71/+125
* | | | | | | Merge branch 'ref-update-multiple-commits' into 'master' Douwe Maan2016-09-082-16/+53
|\ \ \ \ \ \ \
| * | | | | | | Express intentions as expectationsJacob Vosmaer2016-09-071-5/+19
| * | | | | | | Rename {commit,update_branch}_with_hooksJacob Vosmaer2016-09-072-17/+17
| * | | | | | | Allow adding multiple commits in commit_with_hooksJacob Vosmaer2016-09-072-1/+24
* | | | | | | | Merge branch 'update-changelog-with-8-11-5' into 'master' Stan Hu2016-09-081-9/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Update CHANGELOG entries for 8.11.5.update-changelog-with-8-11-5Ruben Davila2016-09-071-9/+8
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'change-update-interval-of-runners' into 'master' Yorick Peterse2016-09-084-5/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Change update interval of runners when trying to preserve contacted_atchange-update-interval-of-runnersKamil Trzcinski2016-09-074-5/+8
* | | | | | | | | Merge branch '21772-expand-gl-method-names-in-importer-classes' into 'master' Rémy Coutable2016-09-086-10/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename `gl_user_id` to `gitlab_user_id` in importer classesAndrew Smith2016-09-086-10/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-update-db-schema' into 'master' Yorick Peterse2016-09-081-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix DB schema to match latest migrationsh-update-db-schemaStan Hu2016-09-081-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-random-failing-tests' into 'master' Stan Hu2016-09-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Make sure DatabaseCleaner.clean runs AFTER Capybara's cleanupAirat Shigapov2016-09-041-1/+1
* | | | | | | | | Merge branch 'feature/prune-old-events' into 'master' Yorick Peterse2016-09-074-0/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Optimized event pruning query to avoid two queries.Olaf Tomalka2016-09-072-4/+12
| * | | | | | | | | Limited amount of pruned Event rows per runOlaf Tomalka2016-09-073-2/+3
| * | | | | | | | | Added cron to prune events older than 12 months.Olaf Tomalka2016-09-074-0/+36
* | | | | | | | | | Merge branch 'blame-ui-fix' into 'master' Annabel Dunstone Gray2016-09-074-21/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix layout issues with blame tableblame-ui-fixPhil Hughes2016-09-064-21/+8
View Lorry Controller Status