summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix note polling when a window has been hiddenrs-fix-note-pollingRobert Speicher2016-06-131-2/+4
* Merge branch 'dz-cleanup-counters' into 'master' Dmitriy Zaporozhets2016-06-131-2/+0
|\
| * Remove counters from Pipeline navigationdz-cleanup-countersDmitriy Zaporozhets2016-06-131-2/+0
* | Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-132-2/+2
|\ \
| * | Improve Gitlab::Auth method namesJacob Vosmaer2016-06-102-2/+2
* | | Merge branch 'fix-related-branches-error-500' into 'master' Kamil Trzciński2016-06-131-1/+1
|\ \ \
| * | | Fix typo causing related branches to Error 500fix-related-branches-error-500Stan Hu2016-06-121-1/+1
| | |/ | |/|
* | | Merge branch 'fix-bulk-assign-labels' into 'master' Jacob Schatz2016-06-131-4/+13
|\ \ \
| * | | Fixes a bug when assigning a label to multiple issuesfix-bulk-assign-labelsAlfredo Sumaran2016-06-101-4/+13
* | | | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable2016-06-132-1/+5
|\ \ \ \
| * | | | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tagSean McGivern2016-06-132-1/+5
* | | | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-138-51/+63
|\ \ \ \ \
| * | | | | Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-104-29/+18
| * | | | | Remove notification level from user modelFelipe Artur2016-06-108-50/+73
* | | | | | Merge branch '18446-when-this-merge-request-is-accepted-this-issue-will-be-cl...Rémy Coutable2016-06-135-9/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Don't try to count a relation with aliases18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twiceSean McGivern2016-06-104-7/+7
| * | | | | Only show issues closing MR when presentSean McGivern2016-06-101-2/+0
| |/ / / /
* | | | | Merge branch 'nav-offscreen-dz-patch' into 'master' Dmitriy Zaporozhets2016-06-115-27/+3
|\ \ \ \ \
| * | | | | Center layout navigation and remove iconsnav-offscreen-dz-patchDmitriy Zaporozhets2016-06-115-27/+3
* | | | | | Merge branch '18417-nav-offscreen' into 'master' Dmitriy Zaporozhets2016-06-1116-179/+124
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix preferences_spec test18417-nav-offscreenAnnabel Dunstone2016-06-102-5/+1
| * | | | | Add back sidebar counters and usernameAnnabel Dunstone2016-06-109-15/+33
| * | | | | Fix safari logo loading animation safari bugAnnabel Dunstone2016-06-102-8/+1
| * | | | | Revert side nav to full width; remove border under nav; remove tooltips on na...Annabel Dunstone2016-06-1012-145/+52
| * | | | | Update media queriesAnnabel Dunstone2016-06-101-3/+3
| * | | | | Fix profile testAnnabel Dunstone2016-06-101-1/+1
| * | | | | Fix logo at all screen widths, update sidebar textAnnabel Dunstone2016-06-107-56/+78
| * | | | | Move tanuki icon to center of nav bar; keep nav closed by default; remove col...Annabel Dunstone2016-06-108-36/+44
* | | | | | Merge branch '18463-search-form-padding-is-too-damn-high' into 'master' Dmitriy Zaporozhets2016-06-111-1/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixed search form paddingLuke "Jared" Bennett2016-06-101-1/+0
* | | | | | Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-101-11/+60
|\ \ \ \ \ \
| * | | | | | Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-101-11/+60
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' in...Robert Speicher2016-06-101-8/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove unused MergeRequest#gitlab_merge_status methodRémy Coutable2016-06-101-8/+0
* | | | | | Merge branch 'labels-placement' into 'master' Dmitriy Zaporozhets2016-06-107-91/+108
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Render issues link on issues subnav unless you visit merge request controllerDmitriy Zaporozhets2016-06-101-1/+1
| * | | | | Render only issues/mr in subnav depends on contextDmitriy Zaporozhets2016-06-102-3/+3
| * | | | | Move Labels and Milestones as sub tab to Issues/MRDmitriy Zaporozhets2016-06-107-90/+107
* | | | | | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-106-15/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-10111-484/+1050
| |\ \ \ \ \ | | |/ / / /
| * | | | | Add send_git_diff helperDouwe Maan2016-06-08114-909/+1439
| |\ \ \ \ \
| * | | | | | Add workhorse controller and API helpersDouwe Maan2016-06-065-10/+21
* | | | | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-1014-229/+296
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fixed merge conflict that caused tests to fail with buildPhil Hughes2016-06-101-1/+1
| * | | | | | CI build page UI updatePhil Hughes2016-06-1014-229/+296
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'icon-color-fix' into 'master' Jacob Schatz2016-06-102-8/+8
|\ \ \ \ \ \
| * | | | | | Update activity SVG pathicon-color-fixAnnabel Dunstone2016-06-092-8/+8
* | | | | | | Merge branch 'prettier-awardable-button-active' into 'master' Jacob Schatz2016-06-101-1/+9
|\ \ \ \ \ \ \
| * | | | | | | Made the awardable buttons prettier when activeprettier-awardable-button-activePhil Hughes2016-06-101-1/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'label-create-error-messages' into 'master' Jacob Schatz2016-06-101-1/+4
|\ \ \ \ \ \ \