summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix merge widget JS for buttonsfix-merge-immediately-buttonDouwe Maan2015-12-161-10/+8
* Merge branch 'master' into fix-merge-immediately-buttonDouwe Maan2015-12-166-56/+33
|\
| * Merge branch 'feature/remove-celluloid' into 'master' Dmitriy Zaporozhets2015-12-162-26/+5
| |\
| | * Update rerun to remove celluloid as dependencyfeature/remove-celluloidGabriel Mazetto2015-12-132-26/+5
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-162-5/+7
| |\ \
| | * \ Merge branch 'mr-builds-fixes' into 'master' Dmitriy Zaporozhets2015-12-161-4/+4
| | |\ \
| | | * | Link to correct (source) project on MR builds tabmr-builds-fixesDouwe Maan2015-12-161-4/+4
| * | | | Merge remote-tracking branch 'origin/rs-simplify-status-icon'Dmitriy Zaporozhets2015-12-163-26/+24
| |\ \ \ \
| | * | | | Define CI status icon colors in SCSS instead of a helperrs-simplify-status-iconRobert Speicher2015-12-123-26/+24
| | | |_|/ | | |/| |
* | | | | Fix updating and disabling merge button when Merge Immediately is clickedDouwe Maan2015-12-162-7/+7
| |_|/ / |/| | |
* | | | Merge branch 'disable-markdown-cache' into 'master' Douwe Maan2015-12-161-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Temporarily disable Markdown cachingDouwe Maan2015-12-161-1/+3
| | |/ | |/|
* | | Merge branch 'fix-milestone-snippet-header' into 'master' Dmitriy Zaporozhets2015-12-1623-182/+186
|\ \ \
| * | | Fix specfix-milestone-snippet-headerDouwe Maan2015-12-161-1/+1
| * | | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-1622-188/+188
| * | | Merge branch 'master' into fix-milestone-snippet-headerDouwe Maan2015-12-16168-1002/+1005
| |\ \ \ | | |/ /
| * | | Fix testsDouwe Maan2015-12-161-1/+1
| * | | Move milestone edit button to the very rightDouwe Maan2015-12-151-4/+4
| * | | Fix headers of milestone and snippet show pagesDouwe Maan2015-12-154-12/+16
* | | | Merge branch 'reference-cache' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \
| * | | | Only cache markdown when object has been saved and has a proper cache_key.Douwe Maan2015-12-161-1/+1
| | |/ / | |/| |
* | | | Merge branch 'fix-merge-immediately' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \
| * | | | Fix 'Merge Immediately' buttonfix-merge-immediatelyDouwe Maan2015-12-161-1/+1
| |/ / /
* | | | Merge branch 'fix-bad-merge' into 'master' Douwe Maan2015-12-161-1/+0
|\ \ \ \
| * | | | Fix bad mergeStan Hu2015-12-161-1/+0
* | | | | Merge branch 'fix-endpoint-not-setting-var' into 'master' Douwe Maan2015-12-161-6/+3
|\ \ \ \ \
| * | | | | Fix endpoint not setting needed @ci_commitZeger-Jan van de Weg2015-12-161-6/+3
* | | | | | Merge branch 'control-list-right-margin' into 'master' Dmitriy Zaporozhets2015-12-161-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix right margin of control listDouwe Maan2015-12-161-1/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'issuable-sidebar' into 'master' Dmitriy Zaporozhets2015-12-161-8/+8
|\ \ \ \ \
| * | | | | Revert "Fix "Notifications" label color"Douwe Maan2015-12-161-1/+1
| * | | | | Revert "Use regularly colored button for "Subscribe"/"Unsubscribe""Douwe Maan2015-12-161-1/+1
| * | | | | Use regularly colored button for "Subscribe"/"Unsubscribe"issuable-sidebarDouwe Maan2015-12-151-1/+1
| * | | | | Fix "Notifications" label colorDouwe Maan2015-12-151-1/+1
| * | | | | Move cross-project reference downDouwe Maan2015-12-151-8/+8
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-border' into 'master' Dmitriy Zaporozhets2015-12-164-4/+9
|\ \ \ \ \
| * | | | | Fix double border in MR discussionDmitriy Zaporozhets2015-12-164-4/+9
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-168-297/+27
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'remove-author-from-email' into 'master' Douwe Maan2015-12-161-2/+0
| |\ \ \ \ \
| | * | | | | Revert "Make sure notify email always has author info."remove-author-from-emailJob van der Voort2015-12-151-2/+0
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'workhorse-passthrough' into 'master' Kamil TrzciƄski2015-12-167-295/+27
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Update workhorse version in doc/install/installation.mdworkhorse-passthroughRobert Speicher2015-12-151-1/+1
| | * | | | Gitlab-workhorse related 8.3 update changesJacob Vosmaer2015-12-151-1/+19
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passt...Jacob Vosmaer2015-12-15290-5131/+3393
| | |\ \ \ \ | | | |/ / /
| | * | | | Update init script options for gitlab-workhorseJacob Vosmaer2015-12-152-2/+3
| | * | | | Require gitlab-workhorse 0.5.0Jacob Vosmaer2015-12-151-1/+1
| | * | | | Pass all requests from NGINX to gitlab-workhorseJacob Vosmaer2015-12-112-290/+3
* | | | | | Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitl...Dmitriy Zaporozhets2015-12-166-1/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add open_issues_count to project APIStan Hu2015-12-116-1/+30
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-165-13/+11
|\ \ \ \ \ \