summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Update gitlab-shell to 2.7.2Yorick Peterse2016-04-071-1/+1
| | | | | | |
* | | | | | | Merge branch '15078-todo-row' into 'master' Jacob Schatz2016-04-081-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use meta key to open todo in new tab Fixes #15078 See merge request !3623
| * | | | | | | Use meta key to open todo in new tab15078-todo-rowAnnabel Dunstone2016-04-081-2/+7
| | | | | | | |
* | | | | | | | Merge branch 'remove-todo' into 'master' Dmitriy Zaporozhets2016-04-081-4/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove TODO for not documented stuff We should not put a `TODO` in a released product. See merge request !3553
| * | | | | | | | Remove TODO for not documented stuffRobert Schilling2016-04-051-4/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'rs-testing-guide' into 'master' Dmitriy Zaporozhets2016-04-083-1/+136
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at a Testing styleguide Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14121 [ci skip] See merge request !3465
| * | | | | | | | | Add a link back to Development documentation to Testing guiders-testing-guideRobert Speicher2016-04-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Add a section about `let` to the Testing guideRobert Speicher2016-04-011-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Factories don't have to be limited to `ActiveRecord` objectsRobert Speicher2016-04-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Add a note about Four-Phase Test to Testing guideRobert Speicher2016-04-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | First pass at a Testing styleguideRobert Speicher2016-04-013-1/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'metrics-timestamp-precision' into 'master' Yorick Peterse2016-04-081-1/+21
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use more accurate timestamps for InfluxDB. See merge request !3617
| * | | | | | | | | Use more accurate timestamps for InfluxDB.metrics-timestamp-precisionYorick Peterse2016-04-081-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the timestamp of metrics to be more accurate/unique by using Time#to_f combined with a small random jitter value. This combination hopefully reduces the amount of collisions, though there's no way to fully prevent any from occurring. Fixes gitlab-com/operations#175
* | | | | | | | | | Merge branch 'gitlab-workhorse-0.7.2' into 'master' Yorick Peterse2016-04-083-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.7.2 See merge request !3570
| * | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-04-0773-310/+1052
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-workhorse-0.7.2
| * | | | | | | | | | Use gitlab-workhorse 0.7.2Jacob Vosmaer2016-04-063-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'api-expose-subscribed' into 'master' Rémy Coutable2016-04-087-25/+46
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose subscribed? on issues and merge requests This is the first start for the new `subscribable` API. It exposes the `subscribed` field for issues and merge requests. Related to #6024 See merge request !3611
| * | | | | | | | | | API: Expose subscribed? on issuesRobert Schilling2016-04-087-25/+46
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Schilling2016-04-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Incorrect Quote In Docker Executor Example ## What does this MR do? The corrected line opened with a regular quote (') but closed with a back-tick (`) I believe this is invalid bash syntax ## Are there points in the code the reviewer needs to double check? Probably not ## Why was this MR needed? Fixes error when example is copied and pasted ## What are the relevant issue numbers? None ## Screenshots (if relevant) None See merge request !3604
| * | | | | | | | | | Fix Incorrect Quote In Docker Executor ExampleAlex Mayer2016-04-071-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'revert-missing-changelog' into 'master' Jacob Schatz2016-04-071-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove changelog entry for new navigation sidebar. See merge request !3608
| * | | | | | | | | | | Remove changelog entry for new navigation sidebar.Jacob Schatz2016-04-071-1/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'code-wrapping' into 'master' Jacob Schatz2016-04-072-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix side-by-side code format & commit message wrap ![Screen_Shot_2016-04-07_at_1.31.28_PM](/uploads/bad00284e4dfbec1fdd75220c34f4a98/Screen_Shot_2016-04-07_at_1.31.28_PM.png) ![Screen_Shot_2016-04-07_at_1.32.23_PM](/uploads/7cd344765025e93d0035934a473b4bb3/Screen_Shot_2016-04-07_at_1.32.23_PM.png) See merge request !3605
| * | | | | | | | | | | | Fix side-by-side code format & commit message wrapcode-wrappingAnnabel Dunstone2016-04-072-0/+6
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'revert-2ed6cd9e' into 'master' Jacob Schatz2016-04-0719-109/+130
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'new-navigation-prototype' into 'master'" This reverts merge request !3494 See merge request !3607
| * | | | | | | | | | | | Revert "Merge branch 'new-navigation-prototype' into 'master'"Jacob Schatz2016-04-0719-109/+130
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | This reverts merge request !3494
* | | | | | | | | | | | Update CHANGELOG for 8.6.5, 8.5.10, 8.4.8, and 8.3.7Robert Speicher2016-04-071-3/+17
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'revert-5e8740ee' into 'master' Jacob Schatz2016-04-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'fix-sidebar-exapnd' into 'master'" This reverts merge request !3520 See merge request !3606
| * | | | | | | | | | Revert "Merge branch 'fix-sidebar-exapnd' into 'master'"revert-5e8740eeJacob Schatz2016-04-071-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | This reverts merge request !3520
* | | | | | | | | | Merge branch 'indentation-bug' into 'master' Jacob Schatz2016-04-071-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve white space See merge request !3602
| * | | | | | | | | | Indentation updateindentation-bugAnnabel Dunstone2016-04-071-2/+0
| | | | | | | | | | |
| * | | | | | | | | | Preserve white spaceAnnabel Dunstone2016-04-071-1/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master' Jacob Schatz2016-04-073-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update number of Todos in the sidebar when it's marked as "Done" Closes #15002 See merge request !3600
| * | | | | | | | | | | Update CHANGELOGfix-number-of-todos-sidebar-is-not-updatedDouglas Barbosa Alexandre2016-04-071-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Update number of Todos in the sidebar when it's marked as "Done"Douglas Barbosa Alexandre2016-04-072-1/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'issue_14012' into 'master' Rémy Coutable2016-04-075-6/+42
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problem when creating milestones in groups without projects Fixes #14012 See merge request !3481
| * | | | | | | | | | Implement review suggestionsFelipe Artur2016-04-074-7/+6
| | | | | | | | | | |
| * | | | | | | | | | Improve codeFelipe Artur2016-04-053-17/+22
| | | | | | | | | | |
| * | | | | | | | | | Improve codeFelipe Artur2016-04-051-7/+15
| | | | | | | | | | |
| * | | | | | | | | | Fix problem when creating milestones in groups without projectsFelipe Artur2016-04-052-5/+29
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'regex-for-colons' into 'master' Douwe Maan2016-04-074-2/+118
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add optional colon. See merge request !3591
| * | | | | | | | | | | CHANGELOGJacob Schatz2016-04-071-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Remove dumb debug statement and add many tests.Jacob Schatz2016-04-073-2/+116
| | | | | | | | | | | |
| * | | | | | | | | | | Add optional colon.Jacob Schatz2016-04-071-1/+2
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'no-gc-auto' into 'master' Yorick Peterse2016-04-072-1/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable git gc --auto See merge request !3572
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into no-gc-autoJacob Vosmaer2016-04-0775-374/+1052
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Disable git gc --autoJacob Vosmaer2016-04-062-1/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dont-assign-me-if-you-arent-allow' into 'master' Rémy Coutable2016-04-071-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide "assign to me" link if not allowed Fixes #14996 See merge request !3590
| * | | | | | | | | | | Remove duplication. Remove JS data attributesJacob Schatz2016-04-071-6/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Hide "assign to me" link if not alloweddont-assign-me-if-you-arent-allowJacob Schatz2016-04-071-5/+7
| | | | | | | | | | | |