Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't schedule ProjectCacheWorker unless neededproject-cache-worker-scheduling | Yorick Peterse | 2016-10-25 | 6 | -18/+77 |
* | Merge branch 'board-dragging-disabled' into 'master' | Sean McGivern | 2016-10-25 | 3 | -2/+7 |
|\ | |||||
| * | Stop unauthized users dragging on issue boardsboard-dragging-disabled | Phil Hughes | 2016-10-25 | 3 | -2/+7 |
* | | Merge branch '23372-fix-ce-to-ee-merge-check-task' into 'master' | Robert Speicher | 2016-10-25 | 5 | -102/+278 |
|\ \ | |||||
| * | | Disable Rails/Output cop since it makes no sense here23372-fix-ce-to-ee-merge-check-task | Rémy Coutable | 2016-10-24 | 1 | -0/+1 |
| * | | Use File.write instead of File.open + File#write | Rémy Coutable | 2016-10-24 | 1 | -1/+1 |
| * | | Don't print out implementation detail step | Rémy Coutable | 2016-10-24 | 1 | -1/+1 |
| * | | Change the approach to check if patches apply cleanly | Rémy Coutable | 2016-10-21 | 5 | -102/+277 |
* | | | Merge branch 'show-commit-status-from-source-project' into 'master' | Douwe Maan | 2016-10-25 | 5 | -5/+47 |
|\ \ \ | |||||
| * | | | Make sure merge request was created before deleting sourceshow-commit-status-from-source-project | Lin Jen-Shin | 2016-10-25 | 1 | -1/+2 |
| * | | | Also keep commits from source_project around, feedback: | Lin Jen-Shin | 2016-10-25 | 1 | -3/+5 |
| * | | | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s... | Lin Jen-Shin | 2016-10-24 | 424 | -2017/+6597 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s... | Lin Jen-Shin | 2016-10-18 | 611 | -6189/+12521 |
| |\ \ \ \ | |||||
| * | | | | | Remove bad stuffs from auto-merging | Lin Jen-Shin | 2016-10-11 | 1 | -2/+0 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s... | Lin Jen-Shin | 2016-10-11 | 493 | -3950/+9006 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add CHANGELOG entry [ci skip] | Lin Jen-Shin | 2016-10-05 | 1 | -1/+2 |
| * | | | | | | Add a view test for showing source commits | Lin Jen-Shin | 2016-10-05 | 1 | -0/+38 |
| * | | | | | | Show commits from source project. Be consistent with: | Lin Jen-Shin | 2016-10-03 | 1 | -1/+1 |
* | | | | | | | Merge branch '21513-fix-branch-protection-api' into 'master' | Douwe Maan | 2016-10-25 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ | Merge branch '23662-issue-move-user-reference-exception' into 'master' | Douwe Maan | 2016-10-25 | 2 | -3/+13 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fix `User#to_reference`23662-issue-move-user-reference-exception | Timothy Andrew | 2016-10-25 | 2 | -3/+13 |
* | | | | | | | | Merge branch 'escape-relative-links' into 'master' | Sean McGivern | 2016-10-25 | 3 | -13/+32 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Escape ref and path for relative links (!6050) | winniehell | 2016-10-24 | 2 | -2/+3 |
| * | | | | | | | | Add failing test for #21420 | winniehell | 2016-10-24 | 1 | -11/+29 |
* | | | | | | | | | Merge branch 'dklischies/gitlab-ce-master' into 'master' | Achilleas Pipinellis | 2016-10-25 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Capitalize Gitdklischies/gitlab-ce-master | Achilleas Pipinellis | 2016-10-25 | 1 | -1/+1 |
| * | | | | | | | | | Add a note regarding syncing the git submodule conf to CI doc. | Daniel Klischies | 2016-10-21 | 1 | -0/+6 |
* | | | | | | | | | | Merge branch 'scope-input-errors' into 'master' | Fatih Acet | 2016-10-25 | 2 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update gl_field_error tests for better input filtering.scope-input-errors | Bryce Johnson | 2016-10-20 | 1 | -2/+2 |
| * | | | | | | | | | | Stop injecting field errors where they won't be used. | Bryce Johnson | 2016-10-20 | 1 | -2/+5 |
* | | | | | | | | | | | Merge branch 'koding-docker-compose-init' into 'master' | Achilleas Pipinellis | 2016-10-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add docker-compose environment initialization command | Sonmez Kartal | 2016-10-25 | 1 | -0/+1 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'sh-fix-labels-move-issue' into 'master' | Rémy Coutable | 2016-10-25 | 4 | -7/+63 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Improve readability and add specs for label filteringsh-fix-labels-move-issue | Stan Hu | 2016-10-24 | 2 | -10/+21 |
| * | | | | | | | | | | | Improve label filtering implementation | Stan Hu | 2016-10-24 | 1 | -10/+4 |
| * | | | | | | | | | | | Allow the use of params[:name] when filtering labels | Stan Hu | 2016-10-24 | 2 | -3/+22 |
| * | | | | | | | | | | | Fix Rubocop offenses in issue move specs | Grzegorz Bizon | 2016-10-24 | 1 | -3/+3 |
| * | | | | | | | | | | | Add spec in Issues::MoveService to fix label assignment regression | Stan Hu | 2016-10-24 | 1 | -5/+26 |
| * | | | | | | | | | | | Fix bug where labels would be assigned to issues that were moved | Stan Hu | 2016-10-24 | 3 | -0/+11 |
* | | | | | | | | | | | | Merge branch '23467-dropdown-overflow' into 'master' | Fatih Acet | 2016-10-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Change overflow scroll to auto23467-dropdown-overflow | Annabel Dunstone Gray | 2016-10-24 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch '23509-remove-redundant-class-name-and-foreign-key' into 'master' | Rémy Coutable | 2016-10-25 | 17 | -35/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Remove redundant class_name and foreign_key overrides | David Wagner | 2016-10-24 | 17 | -35/+35 |
* | | | | | | | | | | | | | Merge branch 'register-tab' into 'master' | Jacob Schatz | 2016-10-25 | 3 | -2/+69 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix rubocop build error | Jacob Schatz | 2016-10-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | Use proper tense and spacing in login_specs.register-tab | Bryce Johnson | 2016-10-24 | 1 | -4/+6 |
| * | | | | | | | | | | | | Test login tab/pane rendering in varying configurations. | Bryce Johnson | 2016-10-24 | 1 | -0/+63 |
| * | | | | | | | | | | | | Only show register tab if signup enabled. | Bryce Johnson | 2016-10-24 | 2 | -2/+4 |
* | | | | | | | | | | | | | Merge branch 'enable-scss-lint-space-after-variable-colon' into 'master' | Annabel Dunstone Gray | 2016-10-24 | 4 | -89/+89 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Enable SpaceAfterVariableColon in scss-lintenable-scss-lint-space-after-variable-colon | Clement Ho | 2016-10-24 | 4 | -89/+89 |