summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | Correctly shows label errors in dropdownlabel-create-error-messagesPhil Hughes2016-06-101-1/+4
| |/ / / /
* | | | | Merge branch 'user-search-dropdown' into 'master' Jacob Schatz2016-06-101-4/+4
|\ \ \ \ \
| * | | | | Revert change to search all usersPhil Hughes2016-06-101-4/+4
| |/ / / /
* | | | | Merge branch 'project-dropdown-position-fix' into 'master' Jacob Schatz2016-06-101-1/+1
|\ \ \ \ \
| * | | | | Fixed project dropdown being overlapped by sidebarproject-dropdown-position-fixPhil Hughes2016-06-101-1/+1
| |/ / / /
* | | | | Merge branch 'label-filter-fix' into 'master' Jacob Schatz2016-06-103-4/+4
|\ \ \ \ \
| * | | | | Added testslabel-filter-fixPhil Hughes2016-06-092-3/+3
| * | | | | Fixed issue where label filtering didnt workPhil Hughes2016-06-091-1/+1
* | | | | | Merge branch 'rename-ci-commit-phase-4' into 'master' Rémy Coutable2016-06-102-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4Kamil Trzcinski2016-06-1051-236/+322
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Rename commit to pipeline in TriggerRequestKamil Trzcinski2016-06-092-2/+2
| | |/ / / / | |/| | | |
* | | | | | Cache the presence of an issue_tracker at project levelPaco Guzman2016-06-102-3/+25
* | | | | | Merge branch 'fix/incremental-trace-update-api' into 'master' Rémy Coutable2016-06-101-2/+2
|\ \ \ \ \ \
| * | | | | | Fix UTF-8 handling in incremental trace update APITomasz Maczukin2016-06-101-2/+2
| | |/ / / / | |/| | | |
* | | | | | Rename ci_commit -> pipelineRémy Coutable2016-06-102-2/+2
* | | | | | Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea...Rémy Coutable2016-06-102-6/+8
* | | | | | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-102-6/+15
* | | | | | Allow or not merge MR with failed buildRui Anderson2016-06-108-22/+53
|/ / / / /
* | | | | Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-094-12/+10
|\ \ \ \ \
| * | | | | Minor MR comment fixes.Fatih Acet2016-06-101-6/+6
| * | | | | Ignore frequent emojis in search.award-emoji-fixesFatih Acet2016-06-091-2/+2
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-0910-96/+123
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-098-16/+97
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Move award_menu_url variable into gon object.Fatih Acet2016-06-092-4/+1
| * | | | | | Render frequent emoji block once.Fatih Acet2016-06-091-1/+3
| * | | | | | Instantiate awardsHandler in application main script.Fatih Acet2016-06-092-2/+1
* | | | | | | Merge branch 'milestone-tooltip' into 'master' Jacob Schatz2016-06-095-6/+43
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipmilestone-tooltipFatih Acet2016-06-0910-96/+123
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0929-47/+330
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0932-73/+112
| |\ \ \ \ \ \
| * | | | | | | Fixes for MR comments.Fatih Acet2016-06-094-5/+5
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-08117-1043/+1726
| |\ \ \ \ \ \ \
| * | | | | | | | Copy changes for milestone due dates.Fatih Acet2016-06-083-3/+3
| * | | | | | | | Revert milestone_remaining_days helper.Fatih Acet2016-06-081-10/+5