summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'move-mr-builds-tab' into 'master' Dmitriy Zaporozhets2015-12-162-11/+11
|\
| * Move MR Builds tab next to CommitsDouwe Maan2015-12-162-11/+11
* | Fix merge widget JS for buttonsfix-merge-immediately-buttonDouwe Maan2015-12-161-10/+8
* | Merge branch 'master' into fix-merge-immediately-buttonDouwe Maan2015-12-163-22/+25
|\ \ | |/
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-4/+4
| |\
| | * 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-162-18/+21
| |\ \ \ | | |/ / | |/| |
| | * | Define CI status icon colors in SCSS instead of a helperrs-simplify-status-iconRobert Speicher2015-12-122-18/+21
* | | | Fix updating and disabling merge button when Merge Immediately is clickedDouwe Maan2015-12-161-4/+4
|/ / /
* | | Merge branch 'fix-milestone-snippet-header' into 'master' Dmitriy Zaporozhets2015-12-1616-172/+176
|\ \ \
| * | | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-1616-179/+179
| * | | Merge branch 'master' into fix-milestone-snippet-headerDouwe Maan2015-12-1635-97/+103
| |\ \ \ | | | |/ | | |/|
| * | | 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-161-2/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitl...Dmitriy Zaporozhets2015-12-161-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add open_issues_count to project APIStan Hu2015-12-111-0/+4
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-164-11/+11
|\ \ \ \ \
| * \ \ \ \ Merge branch 'rs-clipboard-fixes' into 'master' Douwe Maan2015-12-164-11/+11
| |\ \ \ \ \
| | * | | | | Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixesRobert Speicher2015-12-154-11/+11
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-2/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'rs-timeago' into 'master' Douwe Maan2015-12-161-2/+6
| |\ \ \ \ \ \
| | * | | | | | Fix time_ago_with_tooltip for activity feedrs-timeagoRobert Speicher2015-12-111-2/+6
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-162-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'fix-profile-nav' into 'master' Andrey2015-12-162-1/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Make profile navigation full widefix-profile-navDmitriy Zaporozhets2015-12-112-1/+6
* | | | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-1620-45/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fixed CiServices validationfeature/update-rubocopGabriel Mazetto2015-12-152-4/+4
| * | | | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-1520-45/+40