summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'foreign-keys-for-project-model' into 'master'Sean McGivern2017-07-0639-164/+190
|\
| * Rename ActiverecordSerialize copYorick Peterse2017-07-0615-27/+27
| * Added Cop to blacklist the use of `dependent:`Yorick Peterse2017-07-0626-73/+80
| * Add many foreign keys to the projects tableYorick Peterse2017-07-063-68/+87
* | Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master'Rémy Coutable2017-07-061-1/+1
|\ \ | |/ |/|
| * Fix stubbing attributes alongside cache_markdown_fieldNick Thomas2017-07-051-1/+1
* | Merge branch '33657-user-projects-api' into 'master'Rémy Coutable2017-07-061-1/+8
|\ \
| * | Add user projects APIvanadium232017-07-061-1/+8
* | | Merge branch 'additional-commits-integer-fix' into 'master'Sean McGivern2017-07-061-1/+1
|\ \ \
| * | | Fix invalid integer value when more than 1000 commitsadditional-commits-integer-fixPhil Hughes2017-07-051-1/+1
* | | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-066-8/+42
|\ \ \ \
| * \ \ \ Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-PathGrzegorz Bizon2017-07-0526-1028/+968
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-0561-348/+516
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-054-9/+9
| * | | | | Add back Pipeline#ci_yaml_file_path due to all the troublesLin Jen-Shin2017-07-054-14/+14
| * | | | | Fix config pathLin Jen-Shin2017-07-042-2/+2
| * | | | | Also remove null characterLin Jen-Shin2017-07-041-1/+1
| * | | | | Follow feedback on the merge requestLin Jen-Shin2017-07-043-14/+14
| * | | | | Fix various descriptions given the feedbackLin Jen-Shin2017-07-041-1/+1
| * | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-0355-378/+603
| |\ \ \ \ \
| * | | | | | Introduce CI_CONFIG_PATHLin Jen-Shin2017-06-301-1/+2
| * | | | | | Update wordings, allow only full path, add testsLin Jen-Shin2017-06-303-15/+14
| * | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-06-30165-2255/+3554
| |\ \ \ \ \ \
| * | | | | | | Fix the test and implement missing updateLin Jen-Shin2017-06-281-0/+2
| * | | | | | | Try to report where the file should beLin Jen-Shin2017-06-281-1/+1
| * | | | | | | Fix doc, test, and formLin Jen-Shin2017-06-282-87/+8
| * | | | | | | Inline what it was before for the regexp and messageLin Jen-Shin2017-06-281-2/+2
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Confi...15041-Add-Custom-CI-Config-PathLin Jen-Shin2017-06-284509-38991/+97222
| |\ \ \ \ \ \ \
| * | | | | | | | Add config option to project to allow custom .gitlab-ci.yml locationKeith Pope2016-10-084-2/+30
* | | | | | | | | Merge branch '32408-enable-disable-all-restricted-visibility-levels' into 'ma...Douwe Maan2017-07-053-5/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow admin to disable all restricted visibility levels32408-enable-disable-all-restricted-visibility-levelsTiago Botelho2017-07-053-5/+9
* | | | | | | | | | Merge branch '32408-allow-creation-of-files-and-dirs-with-spaces-in-web-ui' i...Douwe Maan2017-07-051-3/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Removes file_name_regex from Gitlab::Regex32408-allow-creation-of-files-and-dirs-with-spaces-in-web-uiTiago Botelho2017-07-051-3/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'dm-project-path-helpers-try-2' into 'master'Sean McGivern2017-07-05333-1046/+853
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-05333-1046/+853
* | | | | | | | | Remove IIFEs around several javascript classesMike Greiling2017-07-0515-785/+763
|/ / / / / / / /
* | | | | | | | Handles realtime with 2 states for environments tableFilipa Lacerda2017-07-053-34/+24
* | | | | | | | Merge branch 'revert-6df61942' into 'master'Douwe Maan2017-07-054-46/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-054-46/+1
* | | | | | | | | Merge branch '34578-sidebar-padding' into 'master'Phil Hughes2017-07-052-2/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | fix sidebar padding for full-width items (Time Tracking help)34578-sidebar-paddingSimon Knox2017-07-052-2/+5
* | | | | | | | | Merge branch '32838-admin-panel-spacing' into 'master'Annabel Dunstone Gray2017-07-052-161/+175
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | 32838 Add wells to admin dashboard overview to fix spacing problems32838-admin-panel-spacingtauriedavis2017-06-282-161/+175
* | | | | | | | | Merge branch '33580-fix-api-scoping' into 'master'Douwe Maan2017-07-051-6/+18
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into '33580-fix-api-scoping'Douwe Maan2017-07-04240-2736/+4368
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | `AccessTokenValidationService` accepts `String` or `API::Scope` scopes.Timothy Andrew2017-06-301-1/+8
| * | | | | | | | | | Extract a `Gitlab::Scope` class.Timothy Andrew2017-06-291-9/+8
| * | | | | | | | | | Implement review comments from @DouweM for !12300.Timothy Andrew2017-06-281-2/+2
| * | | | | | | | | | Fix remaining spec failures for !12300.Timothy Andrew2017-06-281-1/+1
| * | | | | | | | | | Allow API scope declarations to be applied conditionally.Timothy Andrew2017-06-281-6/+9
View Lorry Controller Status