summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-098-8/+110
| | | | Closes #33477
* Merge branch '33202-scrollbar-center' into 'master'Phil Hughes2017-06-082-3/+3
|\ | | | | | | | | | | | | Resolve "Jobs page scrollbar and centering" Closes #33202 See merge request !12000
| * Resolve "Jobs page scrollbar and centering"Filipa Lacerda2017-06-082-3/+3
|/
* Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-0810-13/+15
|\ | | | | | | | | Blob#load_all_data! doesn’t need an argument See merge request !11977
| * Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-0710-13/+15
| |
* | Merge branch 'clean-up-project-for-merge-conflicts' into 'master'Rémy Coutable2017-06-081-16/+21
|\ \ | | | | | | | | | | | | Clean up the Project model to reduce conflicts See merge request !11967
| * | Split Project#reset_cache_and_import_attrs upYorick Peterse2017-06-081-1/+5
| | | | | | | | | | | | | | | | | | In EE we don't want to remove import data for mirrors. By moving this logic to a separate method we can simply re-define the method in EE using "prepend" and call "super" whenever necessary.
| * | Re-order some methods in ProjectYorick Peterse2017-06-081-15/+16
| | | | | | | | | | | | This ensures the order of these methods is identical in CE and EE.
* | | Merge branch '12614-fix-long-message' into 'master'Dmitriy Zaporozhets2017-06-083-18/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix long urls in the title of commit Closes #12614 See merge request !10938
| * | | Fix long urls in the title of commitAlexander Randa2017-05-123-18/+39
| | | |
* | | | Merge branch 'zj-prom-pipeline-count' into 'master'Grzegorz Bizon2017-06-083-0/+18
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Add prometheus metrics on pipeline creation Closes #32624 See merge request !11975
| * | | Add test for prom metric gatheringzj-prom-pipeline-countZ.J. van de Weg2017-06-081-0/+8
| | | |
| * | | Add prometheus metrics on pipeline creationZ.J. van de Weg2017-06-072-0/+10
| | | |
* | | | Merge branch ↵Achilleas Pipinellis2017-06-082-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28607-forking-and-configuring-project-via-api-works-very-unreliable' into 'master' Confirm Project forking behaviour via the API Closes #28607 See merge request !11931
| * | | | Confirm Project forking behaviour via the APIMark Fletcher2017-06-062-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | * It's unclear that the forking operation can still be ongoing * `import_status` is available in Project Entity to determine status
* | | | | Merge branch 'feature/rouge-2.1.0' into 'master'Douwe Maan2017-06-083-29/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | update rouge to 2.1.0 See merge request !11992
| * | | | | remove the rouge copypasta and add notes to refactorhttp://jneen.net/2017-06-072-28/+4
| | | | | |
| * | | | | update rouge to 2.1.0http://jneen.net/2017-06-071-1/+1
| | | | | |
* | | | | | Merge remote-tracking branch 'gl-dev/master'Regis2017-06-073-8/+48
|\ \ \ \ \ \
| * | | | | | Update CHANGELOG.md for 9.0.10Regis2017-06-071-0/+4
| | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG.md for 9.2.5Regis2017-06-071-0/+4
| | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG.md for 9.1.7Regis2017-06-071-0/+4
| | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG.md for 9.1.6Regis2017-06-021-0/+4
| | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG.md for 9.0.9Regis2017-06-021-0/+4
| | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG.md for 9.2.4Regis2017-06-021-0/+4
| | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Merge remote-tracking branch 'gitlab-ce/master'Grzegorz Bizon2017-06-01703-4619/+13091
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ce/master: (349 commits) Revert "Update GITLAB_SHELL_VERSION" Update GITLAB_SHELL_VERSION Add feature toggles through Flipper Add GitLab Resources to University Add Documentation for GIT_CHECKOUT variable Remove entry variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Introduce source to pipeline entity Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions ...
| * | | | | | | Update CHANGELOG.md for 9.0.8Regis2017-05-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Update CHANGELOG.md for 9.1.5Regis2017-05-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Update CHANGELOG.md for 9.2.3Regis2017-05-311-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Update CHANGELOG.md for 9.2.2Regis2017-05-253-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Merge branch 'revert-0a6ee7ce' into 'master'Clement Ho2017-05-253-45/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '32908-edit-comment' into 'master'" See merge request !2106
| | * | | | | | | Revert "Merge branch '32908-edit-comment' into 'master'"Clement Ho2017-05-253-45/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | This reverts merge request !2105
| * | | | | | | Merge branch '32908-edit-comment' into 'master'Clement Ho2017-05-253-2/+45
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escapes html content before appending it to the DOM See merge request !2105
| | * | | | | | | Escapes html content before appending it to the DOMFilipa Lacerda2017-05-253-2/+45
| |/ / / / / / /
* | | | | | | | Merge branch 'responsive-table-fixes' into 'master'Clement Ho2017-06-0810-41/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Responsive table fixes Closes #33376 See merge request !11987
| * | | | | | | | Responsive table fixesAnnabel Dunstone Gray2017-06-0810-41/+55
|/ / / / / / / /
* | | | | | | | Merge branch '33377-fix-null-ref-in-repo-is-ancestor' into 'master'Douwe Maan2017-06-082-8/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nil-check Repository::is_ancestor? Closes #33377 See merge request !11976
| * | | | | | | | nil-check Repository::is_ancestor?Kim Carlbäcker2017-06-082-8/+34
|/ / / / / / / /
* | | | | | | | Merge branch '23603-add-extra-functionality-for-the-top-right-plus-button' ↵Douwe Maan2017-06-0813-16/+261
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Add extra functionality for the top right Plus Button" Closes #23603 See merge request !11632
| * | | | | | | Added more negative checks for public project23603-add-extra-functionality-for-the-top-right-plus-buttonTim Zallmann2017-06-081-1/+19
| | | | | | | |
| * | | | | | | Fix End Syntax ErrorTim Zallmann2017-06-081-3/+2
| | | | | | | |
| * | | | | | | Enhancing Spec's with negative casesTim Zallmann2017-06-073-148/+55
| | | | | | | |
| * | | | | | | Fixed spec test syntax errorsTim Zallmann2017-06-071-4/+58
| | | | | | | |
| * | | | | | | Converting Tests to Spec TestsTim Zallmann2017-06-071-0/+58
| | | | | | | |
| * | | | | | | Fix for Login Test ProblemTim Zallmann2017-06-071-0/+2
| | | | | | | |
| * | | | | | | Added additional classes for easier identifaction during testsTim Zallmann2017-06-073-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Greenfield Tests for Dropdown Menu finished
| * | | | | | | New ... Menu Feature TestsTim Zallmann2017-06-074-28/+113
| | | | | | | |
| * | | | | | | Fixed New Project Top Menu TestTim Zallmann2017-06-072-1/+18
| | | | | | | |
| * | | | | | | Merge remote-tracking branch ↵Tim Zallmann2017-06-070-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'origin/23603-add-extra-functionality-for-the-top-right-plus-button' into 23603-add-extra-functionality-for-the-top-right-plus-button
| | * \ \ \ \ \ \ Merge remote-tracking branch ↵Tim Zallmann2017-06-060-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'origin/23603-add-extra-functionality-for-the-top-right-plus-button' into 23603-add-extra-functionality-for-the-top-right-plus-button
View Lorry Controller Status