summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-optimize-label-finder' into 'master' 23794-hovers-don-t-go-awayStan Hu2016-10-252-1/+2
|\
| * Reduce overhead of LabelFinder by avoiding #presence callsh-optimize-label-finderStan Hu2016-10-252-1/+2
* | Merge branch 'patch-7' into 'master' Rémy Coutable2016-10-251-1/+1
|\ \
| * | Changing gitlab-shell version to 3.6.6 instead of 3.6.3, later on the upgrade...Tobias Genberg2016-10-191-1/+1
* | | Merge branch 'temporarily-revert-appending-templates-before-long-term-ux-fix'...Alfredo Sumaran2016-10-253-14/+7
|\ \ \
| * | | Removed append logictemporarily-revert-appending-templates-before-long-term-ux-fixLuke Bennett2016-10-213-14/+7
* | | | Merge branch 'tidy-up-pipeline-js' into 'master' Alfredo Sumaran2016-10-252-22/+31
|\ \ \ \
| * | | | converted last method to jQuerytidy-up-pipeline-jsLuke Bennett2016-10-202-13/+20
| * | | | Tidied up pipelines.js.es6 and removed jQuery where acceptable.Luke "Jared" Bennett2016-10-201-11/+13
* | | | | Merge branch '22743-issue-tooltip-will-not-disappear-going-back-to-previous-p...Fatih Acet2016-10-253-5/+10
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 22743-issue-tooltip-will-not-disappear-going-back-...Linus G Thiel2016-10-25199-862/+2162
| |\ \ \ \ \
| * | | | | | Close any open tooltips before page:fetchLinus G Thiel2016-10-203-5/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'improve-grape-dsl-rules' into 'master' Robert Speicher2016-10-253-6/+98
|\ \ \ \ \ \
| * | | | | | Improve copyimprove-grape-dsl-rulesRémy Coutable2016-10-171-2/+2
| * | | | | | More improvementsRémy Coutable2016-10-131-3/+3
| * | | | | | Fix typoRémy Coutable2016-10-131-1/+1
| * | | | | | Move the Grape DSL part from Doc styleguide to API styleguideRémy Coutable2016-10-132-11/+43
| * | | | | | Add an API styleguideRémy Coutable2016-10-132-0/+60
* | | | | | | Merge branch 'add-test-for-snippet-download' into 'master' Rémy Coutable2016-10-251-73/+83
|\ \ \ \ \ \ \
| * | | | | | | Add missing tests for download snippetSemyon Pupkov2016-10-131-73/+83
* | | | | | | | Merge branch 'enable-scss-lint-single-line-per-selector' into 'master' Annabel Dunstone Gray2016-10-2542-104/+247
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable SingleLinePerSelector in scss-lintenable-scss-lint-single-line-per-selectorClement Ho2016-10-2442-104/+247
* | | | | | | | | Merge branch 'board-dragging-disabled' into 'master' Sean McGivern2016-10-253-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Stop unauthized users dragging on issue boardsboard-dragging-disabledPhil Hughes2016-10-253-2/+7
* | | | | | | | | | Merge branch '23372-fix-ce-to-ee-merge-check-task' into 'master' Robert Speicher2016-10-255-102/+278
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Disable Rails/Output cop since it makes no sense here23372-fix-ce-to-ee-merge-check-taskRémy Coutable2016-10-241-0/+1
| * | | | | | | | | Use File.write instead of File.open + File#writeRémy Coutable2016-10-241-1/+1
| * | | | | | | | | Don't print out implementation detail stepRémy Coutable2016-10-241-1/+1
| * | | | | | | | | Change the approach to check if patches apply cleanlyRémy Coutable2016-10-215-102/+277
* | | | | | | | | | Merge branch 'show-commit-status-from-source-project' into 'master' Douwe Maan2016-10-255-5/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure merge request was created before deleting sourceshow-commit-status-from-source-projectLin Jen-Shin2016-10-251-1/+2
| * | | | | | | | | | Also keep commits from source_project around, feedback:Lin Jen-Shin2016-10-251-3/+5
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s...Lin Jen-Shin2016-10-24424-2017/+6597
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s...Lin Jen-Shin2016-10-18611-6189/+12521
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove bad stuffs from auto-mergingLin Jen-Shin2016-10-111-2/+0
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s...Lin Jen-Shin2016-10-11493-3950/+9006
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add CHANGELOG entry [ci skip]Lin Jen-Shin2016-10-051-1/+2
| * | | | | | | | | | | | | Add a view test for showing source commitsLin Jen-Shin2016-10-051-0/+38
| * | | | | | | | | | | | | Show commits from source project. Be consistent with:Lin Jen-Shin2016-10-031-1/+1
* | | | | | | | | | | | | | Merge branch '21513-fix-branch-protection-api' into 'master' Douwe Maan2016-10-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '23662-issue-move-user-reference-exception' into 'master' Douwe Maan2016-10-252-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix `User#to_reference`23662-issue-move-user-reference-exceptionTimothy Andrew2016-10-252-3/+13
* | | | | | | | | | | | | | | Merge branch 'escape-relative-links' into 'master' Sean McGivern2016-10-253-13/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Escape ref and path for relative links (!6050)winniehell2016-10-242-2/+3
| * | | | | | | | | | | | | | | Add failing test for #21420winniehell2016-10-241-11/+29
* | | | | | | | | | | | | | | | Merge branch 'dklischies/gitlab-ce-master' into 'master' Achilleas Pipinellis2016-10-251-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Capitalize Gitdklischies/gitlab-ce-masterAchilleas Pipinellis2016-10-251-1/+1
| * | | | | | | | | | | | | | | | Add a note regarding syncing the git submodule conf to CI doc.Daniel Klischies2016-10-211-0/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'scope-input-errors' into 'master' Fatih Acet2016-10-252-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Update gl_field_error tests for better input filtering.scope-input-errorsBryce Johnson2016-10-201-2/+2