summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Addressed review comments5481-epic-todosJan Provaznik2018-06-2112-185/+120
* [ci skip] Add group dropdown to todosKushal Pandya2018-06-198-20/+35
* [ci skip] Add todo button in Epic sidebarKushal Pandya2018-06-187-182/+319
* Fix rubocop offence `Layout/ClosingParenthesisIndentation`Kushal Pandya2018-06-181-1/+2
* Support todos for epicsJarka Kadlecová2018-06-1821-35/+621
* Merge branch 'ce-to-ee-2018-06-17' into 'master'Stan Hu2018-06-175-9/+23
|\
| * Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-17GitLab Bot2018-06-175-9/+23
| |\ |/ /
| * Merge branch 'remove-ci_job_request_with_tags_matcher' into 'master'Stan Hu2018-06-172-7/+10
| |\
| | * Remove the ci_job_request_with_tags_matcherremove-ci_job_request_with_tags_matcherKamil Trzciński2018-06-172-7/+10
| * | Merge branch 'optimise-paused-runners' into 'master'Stan Hu2018-06-173-2/+13
| |\ \ | | |/ | |/|
| | * Optimised paused runners to not re-query every 3soptimise-paused-runnersKamil Trzciński2018-06-173-2/+13
| |/
* | Merge branch 'ce-to-ee-2018-06-16' into 'master'Stan Hu2018-06-172-7/+8
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-16GitLab Bot2018-06-162-7/+8
| |\ \ |/ / / | | _
| * Merge branch 'update-nav-theme-previews' into 'master'Dmitriy Zaporozhets2018-06-162-7/+8
| |\
| | * Harmonize theme preferences previewsupdate-nav-theme-previewsAndreas Kämmerle2018-06-162-7/+8
* | | Merge branch 'ce-to-ee-2018-06-16' into 'master'Stan Hu2018-06-162-1/+2
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-16GitLab Bot2018-06-162-1/+2
| |\ \ \ |/ / / / | | _ / | | /
| * | Merge branch '47610-bs4-mini-graph-dropdown-sometimes-open-on-the-top' into '...Annabel Gray2018-06-162-1/+2
| |\ \
| | * | Fix ci mini graph dropdown alignment and positioning47610-bs4-mini-graph-dropdown-sometimes-open-on-the-topClement Ho2018-06-152-1/+2
* | | | Merge branch 'ce-to-ee-2018-06-16' into 'master'Stan Hu2018-06-1630-40/+100
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-16GitLab Bot2018-06-1630-40/+100
| |\ \ \ \ |/ / / / / | | _ / / | | / /
| * | | Merge branch '47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizes' ...Annabel Gray2018-06-161-0/+1
| |\ \ \
| | * | | Enable display static for ci job dropdowns so that they dont move when window...47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizesClement Ho2018-06-151-0/+1
| * | | | Merge branch 'remove-small-container-width' into 'master'Annabel Gray2018-06-167-10/+11
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add container width for project empty placeholderGeorge Tsiolis2018-06-151-0/+1
| | * | | Remove small container widthGeorge Tsiolis2018-06-157-10/+10
| * | | | Merge branch '47917-wiki-git-access' into 'master'Clement Ho2018-06-152-2/+1
| |\ \ \ \
| | * | | | Resolve "Wiki git clone holder and dropdown is broken"Annabel Gray2018-06-152-2/+1
| |/ / / /
| * | | | Merge branch 'enable-no-multi-assign' into 'master'Mike Greiling2018-06-1517-13/+38
| |\ \ \ \
| | * | | | Enable no-multi-assignment in JS filesgfyoung2018-06-1517-13/+38
| | | |_|/ | | |/| |
| * | | | Merge branch '45557-machine-type-help-links' into 'master'Fatih Acet2018-06-152-7/+22
| |\ \ \ \
| | * | | | Resolve "Update link in GitLab cluster setup form to say "see pricing""Taurie Davis2018-06-152-7/+22
| |/ / / /
| * | | | Merge branch '47879-misalignment-in-rows-on-comparison-page' into 'master'Annabel Gray2018-06-151-0/+4
| |\ \ \ \
| | * | | | Resolve "Misalignment in rows on comparison page"Clement Ho2018-06-151-0/+4
| |/ / / /
| * | | | Merge branch '46610-stop-horizontal-scrolling-when-clicking-on-board-issue' i...Fatih Acet2018-06-151-35/+0
| |\ \ \ \
| | * | | | Resolve "Stop horizontal scrolling when clicking on board issue"Constance Okoghenun2018-06-151-35/+0
| |/ / / /
| * | | | Merge branch '47975-project-select-dropdown-is-broken-for-group-issues-and-me...Annabel Gray2018-06-151-1/+1
| |\ \ \ \
| | * | | | Fix project select dropdown in group issues and mr empty state47975-project-select-dropdown-is-broken-for-group-issues-and-merge-requestsClement Ho2018-06-151-1/+1
| * | | | | Merge branch 'jivl-remove-additional-border-users-no-group' into 'master'Clement Ho2018-06-152-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Remove additional border from the create project pageJose2018-06-152-2/+2
| * | | | | Merge branch 'fix-alert-colors' into 'master'Annabel Gray2018-06-152-3/+22
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix alert colorsClement Ho2018-06-152-3/+22
| |/ / / /
| * | | | Merge branch 'jivl-fix-dropdown-going-out-of-screen' into 'master'Clement Ho2018-06-158-10/+10
| |\ \ \ \
| | * | | | Fix dropdown from project welcome page moving out of the screenjivl-fix-dropdown-going-out-of-screenJose2018-06-158-10/+10
| * | | | | Merge branch 'fix-web-ide-disable-markdown-autocomplete' into 'master'Phil Hughes2018-06-153-0/+25
| |\ \ \ \ \
| | * | | | | Fix #47796 "Web IDE autocomplete should be disabled in markdown files"Isaac Smith2018-06-153-0/+25
| * | | | | | Merge branch 'remove-pointer-events' into 'master'Annabel Gray2018-06-152-5/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Remove pointer events in favor of boundary viewportClement Ho2018-06-152-5/+1
| |/ / / / /
* | | | | | Merge branch 'ce-to-ee-2018-06-15' into 'master'Stan Hu2018-06-1547-379/+407
|\ \ \ \ \ \
| * | | | | | resolve conflict in app/assets/javascripts/boards/stores/boards_store.jsLukas Eipert2018-06-152-17/+24