Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix merge widget JS for buttonsfix-merge-immediately-button | Douwe Maan | 2015-12-16 | 1 | -10/+8 |
* | Merge branch 'master' into fix-merge-immediately-button | Douwe Maan | 2015-12-16 | 6 | -56/+33 |
|\ | |||||
| * | Merge branch 'feature/remove-celluloid' into 'master' | Dmitriy Zaporozhets | 2015-12-16 | 2 | -26/+5 |
| |\ | |||||
| | * | Update rerun to remove celluloid as dependencyfeature/remove-celluloid | Gabriel Mazetto | 2015-12-13 | 2 | -26/+5 |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-12-16 | 2 | -5/+7 |
| |\ \ | |||||
| | * \ | Merge branch 'mr-builds-fixes' into 'master' | Dmitriy Zaporozhets | 2015-12-16 | 1 | -4/+4 |
| | |\ \ | |||||
| | | * | | Link to correct (source) project on MR builds tabmr-builds-fixes | Douwe Maan | 2015-12-16 | 1 | -4/+4 |
| * | | | | Merge remote-tracking branch 'origin/rs-simplify-status-icon' | Dmitriy Zaporozhets | 2015-12-16 | 3 | -26/+24 |
| |\ \ \ \ | |||||
| | * | | | | Define CI status icon colors in SCSS instead of a helperrs-simplify-status-icon | Robert Speicher | 2015-12-12 | 3 | -26/+24 |
| | | |_|/ | | |/| | | |||||
* | | | | | Fix updating and disabling merge button when Merge Immediately is clicked | Douwe Maan | 2015-12-16 | 2 | -7/+7 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'disable-markdown-cache' into 'master' | Douwe Maan | 2015-12-16 | 1 | -1/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Temporarily disable Markdown caching | Douwe Maan | 2015-12-16 | 1 | -1/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'fix-milestone-snippet-header' into 'master' | Dmitriy Zaporozhets | 2015-12-16 | 23 | -182/+186 |
|\ \ \ | |||||
| * | | | Fix specfix-milestone-snippet-header | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
| * | | | Rename .issuable-details to .detail-page (and -header and -description) | Douwe Maan | 2015-12-16 | 22 | -188/+188 |
| * | | | Merge branch 'master' into fix-milestone-snippet-header | Douwe Maan | 2015-12-16 | 168 | -1002/+1005 |
| |\ \ \ | | |/ / | |||||
| * | | | Fix tests | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
| * | | | Move milestone edit button to the very right | Douwe Maan | 2015-12-15 | 1 | -4/+4 |
| * | | | Fix headers of milestone and snippet show pages | Douwe Maan | 2015-12-15 | 4 | -12/+16 |
* | | | | Merge branch 'reference-cache' into 'master' | Robert Speicher | 2015-12-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Only cache markdown when object has been saved and has a proper cache_key. | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fix-merge-immediately' into 'master' | Robert Speicher | 2015-12-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix 'Merge Immediately' buttonfix-merge-immediately | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'fix-bad-merge' into 'master' | Douwe Maan | 2015-12-16 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Fix bad merge | Stan Hu | 2015-12-16 | 1 | -1/+0 |
* | | | | | Merge branch 'fix-endpoint-not-setting-var' into 'master' | Douwe Maan | 2015-12-16 | 1 | -6/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix endpoint not setting needed @ci_commit | Zeger-Jan van de Weg | 2015-12-16 | 1 | -6/+3 |
* | | | | | | Merge branch 'control-list-right-margin' into 'master' | Dmitriy Zaporozhets | 2015-12-16 | 1 | -1/+5 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix right margin of control list | Douwe Maan | 2015-12-16 | 1 | -1/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'issuable-sidebar' into 'master' | Dmitriy Zaporozhets | 2015-12-16 | 1 | -8/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "Fix "Notifications" label color" | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
| * | | | | | Revert "Use regularly colored button for "Subscribe"/"Unsubscribe"" | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
| * | | | | | Use regularly colored button for "Subscribe"/"Unsubscribe"issuable-sidebar | Douwe Maan | 2015-12-15 | 1 | -1/+1 |
| * | | | | | Fix "Notifications" label color | Douwe Maan | 2015-12-15 | 1 | -1/+1 |
| * | | | | | Move cross-project reference down | Douwe Maan | 2015-12-15 | 1 | -8/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'fix-border' into 'master' | Dmitriy Zaporozhets | 2015-12-16 | 4 | -4/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Fix double border in MR discussion | Dmitriy Zaporozhets | 2015-12-16 | 4 | -4/+9 |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-12-16 | 8 | -297/+27 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'remove-author-from-email' into 'master' | Douwe Maan | 2015-12-16 | 1 | -2/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revert "Make sure notify email always has author info."remove-author-from-email | Job van der Voort | 2015-12-15 | 1 | -2/+0 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'workhorse-passthrough' into 'master' | Kamil TrzciĆski | 2015-12-16 | 7 | -295/+27 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Update workhorse version in doc/install/installation.mdworkhorse-passthrough | Robert Speicher | 2015-12-15 | 1 | -1/+1 |
| | * | | | | Gitlab-workhorse related 8.3 update changes | Jacob Vosmaer | 2015-12-15 | 1 | -1/+19 |
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passt... | Jacob Vosmaer | 2015-12-15 | 290 | -5131/+3393 |
| | |\ \ \ \ | | | |/ / / | |||||
| | * | | | | Update init script options for gitlab-workhorse | Jacob Vosmaer | 2015-12-15 | 2 | -2/+3 |
| | * | | | | Require gitlab-workhorse 0.5.0 | Jacob Vosmaer | 2015-12-15 | 1 | -1/+1 |
| | * | | | | Pass all requests from NGINX to gitlab-workhorse | Jacob Vosmaer | 2015-12-11 | 2 | -290/+3 |
* | | | | | | Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitl... | Dmitriy Zaporozhets | 2015-12-16 | 6 | -1/+31 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add open_issues_count to project API | Stan Hu | 2015-12-11 | 6 | -1/+30 |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-12-16 | 5 | -13/+11 |
|\ \ \ \ \ \ |