summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove icons from button on wiki pages. Also consistent padding between butto...dz-improve-ui-consistency-2Dmitriy Zaporozhets2016-06-086-11/+2
| * | | | | | | | Improve buttons size and paddings in the listsDmitriy Zaporozhets2016-06-083-10/+7
| * | | | | | | | Use responsive top-area on project branches and tags pagesDmitriy Zaporozhets2016-06-082-27/+26
| * | | | | | | | Improve button margin for btn-grouped css classDmitriy Zaporozhets2016-06-083-7/+5
* | | | | | | | | Merge branch 'due-date-field-ux-improv' into 'master' Jacob Schatz2016-06-093-6/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improved the UX of issue & milestone date pickerPhil Hughes2016-06-093-6/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'issue_17607' into 'master' Jacob Schatz2016-06-091-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add tests for dates on tooltipsAlfredo Sumaran2016-06-091-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'merge-conflicts-icon-color' into 'master' Jacob Schatz2016-06-091-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Use warning color merge conflicts icon in MR status widget.merge-conflicts-icon-colorFatih Acet2016-06-061-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'labels-ui-fix' into 'master' Jacob Schatz2016-06-092-22/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated subscribe iconPhil Hughes2016-06-091-4/+6
| * | | | | | | | Updated labels UIPhil Hughes2016-06-092-19/+40
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '17562-filter-issues-is-only-visible-when-user-is-logged-in' int...Jacob Schatz2016-06-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes issue search form hiding when current_user is nil (guest user)Luke Bennett2016-06-071-1/+1
* | | | | | | | | Merge branch 'rs-fix-ldap-2fa-login' into 'master' Robert Speicher2016-06-091-1/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix 2FA-based login for LDAP usersrs-fix-ldap-2fa-loginRobert Speicher2016-06-071-1/+2
* | | | | | | | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-091-2/+2
* | | | | | | | | | Shows award emoji for comments to all users who are logged in.Connor Shea2016-06-081-1/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch '17240-svg' into 'master' Jacob Schatz2016-06-0815-20/+183
|\ \ \ \ \ \ \ \ \