summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't schedule ProjectCacheWorker unless neededproject-cache-worker-schedulingYorick Peterse2016-10-256-18/+77
* 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
| * | | | | | | | | | Stop injecting field errors where they won't be used.Bryce Johnson2016-10-201-2/+5
* | | | | | | | | | | Merge branch 'koding-docker-compose-init' into 'master' Achilleas Pipinellis2016-10-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add docker-compose environment initialization commandSonmez Kartal2016-10-251-0/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-fix-labels-move-issue' into 'master' Rémy Coutable2016-10-254-7/+63
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve readability and add specs for label filteringsh-fix-labels-move-issueStan Hu2016-10-242-10/+21
| * | | | | | | | | | | Improve label filtering implementationStan Hu2016-10-241-10/+4
| * | | | | | | | | | | Allow the use of params[:name] when filtering labelsStan Hu2016-10-242-3/+22
| * | | | | | | | | | | Fix Rubocop offenses in issue move specsGrzegorz Bizon2016-10-241-3/+3
| * | | | | | | | | | | Add spec in Issues::MoveService to fix label assignment regressionStan Hu2016-10-241-5/+26
| * | | | | | | | | | | Fix bug where labels would be assigned to issues that were movedStan Hu2016-10-243-0/+11
* | | | | | | | | | | | Merge branch '23467-dropdown-overflow' into 'master' Fatih Acet2016-10-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Change overflow scroll to auto23467-dropdown-overflowAnnabel Dunstone Gray2016-10-241-1/+1
* | | | | | | | | | | | | Merge branch '23509-remove-redundant-class-name-and-foreign-key' into 'master' Rémy Coutable2016-10-2517-35/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove redundant class_name and foreign_key overridesDavid Wagner2016-10-2417-35/+35
* | | | | | | | | | | | | Merge branch 'register-tab' into 'master' Jacob Schatz2016-10-253-2/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix rubocop build errorJacob Schatz2016-10-241-1/+1
| * | | | | | | | | | | | Use proper tense and spacing in login_specs.register-tabBryce Johnson2016-10-241-4/+6
| * | | | | | | | | | | | Test login tab/pane rendering in varying configurations.Bryce Johnson2016-10-241-0/+63
| * | | | | | | | | | | | Only show register tab if signup enabled.Bryce Johnson2016-10-242-2/+4
* | | | | | | | | | | | | Merge branch 'enable-scss-lint-space-after-variable-colon' into 'master' Annabel Dunstone Gray2016-10-244-89/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Enable SpaceAfterVariableColon in scss-lintenable-scss-lint-space-after-variable-colonClement Ho2016-10-244-89/+89