summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'enable-scss-lint-single-line-per-selector' into 'master' Annabel Dunstone Gray2016-10-2541-103/+246
|\
| * Enable SingleLinePerSelector in scss-lintenable-scss-lint-single-line-per-selectorClement Ho2016-10-2441-103/+246
* | Merge branch 'board-dragging-disabled' into 'master' Sean McGivern2016-10-251-1/+1
|\ \
| * | Stop unauthized users dragging on issue boardsboard-dragging-disabledPhil Hughes2016-10-251-1/+1
* | | Merge branch 'show-commit-status-from-source-project' into 'master' Douwe Maan2016-10-252-4/+6
|\ \ \
| * | | 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-24227-865/+2522
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s...Lin Jen-Shin2016-10-18258-2219/+4418
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-commit-status-from-s...Lin Jen-Shin2016-10-11259-1731/+2633
| |\ \ \ \ \
| * | | | | | Show commits from source project. Be consistent with:Lin Jen-Shin2016-10-031-1/+1
* | | | | | | Merge branch '23662-issue-move-user-reference-exception' into 'master' Douwe Maan2016-10-251-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix `User#to_reference`23662-issue-move-user-reference-exceptionTimothy Andrew2016-10-251-1/+1
* | | | | | | Merge branch 'scope-input-errors' into 'master' Fatih Acet2016-10-251-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Stop injecting field errors where they won't be used.Bryce Johnson2016-10-201-2/+5
* | | | | | | | Merge branch 'sh-fix-labels-move-issue' into 'master' Rémy Coutable2016-10-251-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve readability and add specs for label filteringsh-fix-labels-move-issueStan Hu2016-10-241-8/+5
| * | | | | | | | Improve label filtering implementationStan Hu2016-10-241-10/+4
| * | | | | | | | Allow the use of params[:name] when filtering labelsStan Hu2016-10-241-3/+10
| * | | | | | | | Fix bug where labels would be assigned to issues that were movedStan Hu2016-10-241-0/+4
* | | | | | | | | 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-2514-30/+30
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove redundant class_name and foreign_key overridesDavid Wagner2016-10-2414-30/+30
* | | | | | | | | | Merge branch 'register-tab' into 'master' Jacob Schatz2016-10-251-2/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Only show register tab if signup enabled.Bryce Johnson2016-10-241-2/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'enable-scss-lint-space-after-variable-colon' into 'master' Annabel Dunstone Gray2016-10-243-88/+88
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable SpaceAfterVariableColon in scss-lintenable-scss-lint-space-after-variable-colonClement Ho2016-10-243-88/+88
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'enable-scss-lint-space-around-operator' into 'master' Annabel Dunstone Gray2016-10-242-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Enable SpaceAroundOperator in scss-lintClement Ho2016-10-242-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'enable-scss-lint-trailing-whitespace' into 'master' Annabel Dunstone Gray2016-10-2411-25/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable trailingWhitespace in scss-lintClement Ho2016-10-2411-25/+25
| |/ / / / / / /
* | | | | | | | Merge branch '23325-pipeline-graph-hidden' into 'master' Alfredo Sumaran2016-10-242-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | invoked the pipelines class when builds are dynamically loaded and dispatched...Luke Bennett2016-10-242-0/+4
| |/ / / / / / /
* | | | | | | | Replaced deprecated use of document.body.scrollTopLuke Bennett2016-10-241-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'fix-container-registry-project-settings' into 'master' Sean McGivern2016-10-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in project settings that prevents users from enabling container regi...fix-container-registry-project-settingsAdam Niedzielski2016-10-241-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'sign_in_forgot_password' into 'master' Fatih Acet2016-10-242-1/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into sign_in_forgot_passwordBernardo Anderson2016-10-224-4/+40
| |\ \ \ \ \ \
| * | | | | | | Add empty line before media queryBernardo Anderson2016-10-221-0/+1
| * | | | | | | Fix sign in page Forgot your password link overlapBernardo Anderson2016-10-222-1/+7
* | | | | | | | Merge branch 'security-fix-leaking-namespace-name' into 'security' Douwe Maan2016-10-242-4/+4
* | | | | | | | Merge branch 'barthc/gitlab-ce-prevent_authored_vote_from_notes'Rémy Coutable2016-10-241-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix authored vote from notesbarthc2016-10-241-2/+4
* | | | | | | | | Merge branch 'yesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-s...Dmitriy Zaporozhets2016-10-245-4/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update project member controller to match recent master logicyesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-successDmitriy Zaporozhets2016-10-241-9/+7
| * | | | | | | | | Add parentheses around return redirect_to methodDmitriy Zaporozhets2016-10-242-2/+2
| * | | | | | | | | Refactor js that disable form submit if no members selectedDmitriy Zaporozhets2016-10-243-6/+1
| * | | | | | | | | Refactor groups/projects members controllerDmitriy Zaporozhets2016-10-242-9/+11
| * | | | | | | | | Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-245-3/+18
| * | | | | | | | | Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twit...Dmitriy Zaporozhets2016-10-241-1/+1
| |/ / / / / / / /