summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Insert notification settings dropdown into groupsFelipe Artur2016-06-222-1/+4
* Re-use notifications dropdown on user profileFelipe Artur2016-06-169-44/+50
* Refactor custom notifications controller code and add specsFelipe Artur2016-06-141-2/+2
* Remove schema from branch historyFelipe Artur2016-06-133-10/+56
* 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 '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 '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable2016-06-131-1/+1
|\ \
| * | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tagSean McGivern2016-06-131-1/+1
* | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-133-29/+3
|\ \ \
| * | | Remove notification level from user modelFelipe Artur2016-06-103-29/+3
| |/ /
* | | 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
| |/
* | Center layout navigation and remove iconsnav-offscreen-dz-patchDmitriy Zaporozhets2016-06-114-27/+1
* | Fix preferences_spec test18417-nav-offscreenAnnabel Dunstone2016-06-101-1/+1
* | Add back sidebar counters and usernameAnnabel Dunstone2016-06-104-3/+12
* | Revert side nav to full width; remove border under nav; remove tooltips on na...Annabel Dunstone2016-06-106-44/+35
* | Fix logo at all screen widths, update sidebar textAnnabel Dunstone2016-06-101-2/+2
* | Move tanuki icon to center of nav bar; keep nav closed by default; remove col...Annabel Dunstone2016-06-103-9/+9
* | 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 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-105-170/+133
|\ \
| * | Fixed merge conflict that caused tests to fail with buildPhil Hughes2016-06-101-1/+1
| * | CI build page UI updatePhil Hughes2016-06-105-170/+133
* | | 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 'label-filter-fix' into 'master' Jacob Schatz2016-06-101-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added testslabel-filter-fixPhil Hughes2016-06-091-1/+1
* | | | Rename ci_commit -> pipelineRémy Coutable2016-06-101-1/+1
* | | | Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea...Rémy Coutable2016-06-101-1/+1
* | | | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-101-1/+1
* | | | Allow or not merge MR with failed buildRui Anderson2016-06-105-13/+35
| |_|/ |/| |
* | | Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-091-3/+0
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-094-24/+48
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-092-3/+4
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Move award_menu_url variable into gon object.Fatih Acet2016-06-091-3/+0
* | | | | Merge branch 'milestone-tooltip' into 'master' Jacob Schatz2016-06-092-3/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipmilestone-tooltipFatih Acet2016-06-094-24/+48
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0920-26/+190
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0921-63/+52
| |\ \ \ \
| * | | | | Fixes for MR comments.Fatih Acet2016-06-092-2/+2
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0857-555/+617
| |\ \ \ \ \
| * | | | | | Copy changes for milestone due dates.Fatih Acet2016-06-081-1/+1
| * | | | | | Use title attribute instead of data-original-title.Fatih Acet2016-06-081-2/+2
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0634-135/+246
| |\ \ \ \ \ \
| * | | | | | | Show milestone remaining tooltip in right sidebar.Fatih Acet2016-06-031-2/+4
* | | | | | | | Merge branch 'dz-improve-ui-consistency-2' into 'master' Jacob Schatz2016-06-0914-55/+40
|\ \ \ \ \ \ \ \