Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'labels-placement' into 'master' | Dmitriy Zaporozhets | 2016-06-10 | 7 | -91/+108 |
|\ | |||||
| * | Render issues link on issues subnav unless you visit merge request controller | Dmitriy Zaporozhets | 2016-06-10 | 1 | -1/+1 |
| * | Render only issues/mr in subnav depends on context | Dmitriy Zaporozhets | 2016-06-10 | 2 | -3/+3 |
| * | Move Labels and Milestones as sub tab to Issues/MR | Dmitriy Zaporozhets | 2016-06-10 | 7 | -90/+107 |
* | | Merge branch 'workhorse-helpers' into 'master' | Robert Speicher | 2016-06-10 | 6 | -15/+30 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' into workhorse-helpers | Douwe Maan | 2016-06-10 | 111 | -484/+1050 |
| |\ | |||||
| * \ | Add send_git_diff helper | Douwe Maan | 2016-06-08 | 114 | -909/+1439 |
| |\ \ | |||||
| * | | | Add workhorse controller and API helpers | Douwe Maan | 2016-06-06 | 5 | -10/+21 |
* | | | | Merge branch 'ci-page-ui-update' into 'master' | Jacob Schatz | 2016-06-10 | 14 | -229/+296 |
|\ \ \ \ | |||||
| * | | | | Fixed merge conflict that caused tests to fail with build | Phil Hughes | 2016-06-10 | 1 | -1/+1 |
| * | | | | CI build page UI update | Phil Hughes | 2016-06-10 | 14 | -229/+296 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'icon-color-fix' into 'master' | Jacob Schatz | 2016-06-10 | 2 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | Update activity SVG pathicon-color-fix | Annabel Dunstone | 2016-06-09 | 2 | -8/+8 |
* | | | | | Merge branch 'prettier-awardable-button-active' into 'master' | Jacob Schatz | 2016-06-10 | 1 | -1/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Made the awardable buttons prettier when activeprettier-awardable-button-active | Phil Hughes | 2016-06-10 | 1 | -1/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'label-create-error-messages' into 'master' | Jacob Schatz | 2016-06-10 | 1 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Correctly shows label errors in dropdownlabel-create-error-messages | Phil Hughes | 2016-06-10 | 1 | -1/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'user-search-dropdown' into 'master' | Jacob Schatz | 2016-06-10 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Revert change to search all users | Phil Hughes | 2016-06-10 | 1 | -4/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'project-dropdown-position-fix' into 'master' | Jacob Schatz | 2016-06-10 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed project dropdown being overlapped by sidebarproject-dropdown-position-fix | Phil Hughes | 2016-06-10 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'label-filter-fix' into 'master' | Jacob Schatz | 2016-06-10 | 3 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Added testslabel-filter-fix | Phil Hughes | 2016-06-09 | 2 | -3/+3 |
| * | | | | | Fixed issue where label filtering didnt work | Phil Hughes | 2016-06-09 | 1 | -1/+1 |
* | | | | | | Merge branch 'rename-ci-commit-phase-4' into 'master' | Rémy Coutable | 2016-06-10 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4 | Kamil Trzcinski | 2016-06-10 | 51 | -236/+322 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Rename commit to pipeline in TriggerRequest | Kamil Trzcinski | 2016-06-09 | 2 | -2/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Cache the presence of an issue_tracker at project level | Paco Guzman | 2016-06-10 | 2 | -3/+25 |
* | | | | | | Merge branch 'fix/incremental-trace-update-api' into 'master' | Rémy Coutable | 2016-06-10 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix UTF-8 handling in incremental trace update API | Tomasz Maczukin | 2016-06-10 | 1 | -2/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Rename ci_commit -> pipeline | Rémy Coutable | 2016-06-10 | 2 | -2/+2 |
* | | | | | | Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea... | Rémy Coutable | 2016-06-10 | 2 | -6/+8 |
* | | | | | | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'... | Rémy Coutable | 2016-06-10 | 2 | -6/+15 |
* | | | | | | Allow or not merge MR with failed build | Rui Anderson | 2016-06-10 | 8 | -22/+53 |
|/ / / / / | |||||
* | | | | | Merge branch 'award-emoji-fixes' into 'master' | Jacob Schatz | 2016-06-09 | 4 | -12/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Minor MR comment fixes. | Fatih Acet | 2016-06-10 | 1 | -6/+6 |
| * | | | | | Ignore frequent emojis in search.award-emoji-fixes | Fatih Acet | 2016-06-09 | 1 | -2/+2 |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes | Fatih Acet | 2016-06-09 | 10 | -96/+123 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes | Fatih Acet | 2016-06-09 | 8 | -16/+97 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Move award_menu_url variable into gon object. | Fatih Acet | 2016-06-09 | 2 | -4/+1 |
| * | | | | | | Render frequent emoji block once. | Fatih Acet | 2016-06-09 | 1 | -1/+3 |
| * | | | | | | Instantiate awardsHandler in application main script. | Fatih Acet | 2016-06-09 | 2 | -2/+1 |
* | | | | | | | Merge branch 'milestone-tooltip' into 'master' | Jacob Schatz | 2016-06-09 | 5 | -6/+43 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipmilestone-tooltip | Fatih Acet | 2016-06-09 | 10 | -96/+123 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip | Fatih Acet | 2016-06-09 | 29 | -47/+330 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip | Fatih Acet | 2016-06-09 | 32 | -73/+112 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fixes for MR comments. | Fatih Acet | 2016-06-09 | 4 | -5/+5 |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip | Fatih Acet | 2016-06-08 | 117 | -1043/+1726 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Copy changes for milestone due dates. | Fatih Acet | 2016-06-08 | 3 | -3/+3 |
| * | | | | | | | | Revert milestone_remaining_days helper. | Fatih Acet | 2016-06-08 | 1 | -10/+5 |