summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* replace jquery.cookie vendor script with js.cookieMike Greiling2016-10-2411-19/+19
* 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
| |/ / /
* | | | Merge branch '21513-fix-branch-protection-api' into 'master' Douwe Maan2016-10-243-0/+81
|\ \ \ \
| * | | | Implement third round of review comments from @DouweM.21513-fix-branch-protection-apiTimothy Andrew2016-10-242-13/+4
| * | | | Implement second round of review comments from @DouweM.Timothy Andrew2016-10-242-8/+8
| * | | | Implement review comments from @DouweM.Timothy Andrew2016-10-242-12/+17
| * | | | Implement review comments from @dbalexandre.Timothy Andrew2016-10-241-37/+8
| * | | | Fix branch protection API.Timothy Andrew2016-10-243-0/+114
| | |_|/ | |/| |
* | | | Merge branch 'issue-boards-user-url' into 'master' Fatih Acet2016-10-241-1/+1
|\ \ \ \
| * | | | Use root_url for issue boards user linkPhil Hughes2016-10-241-1/+1
* | | | | Merge branch 'remove-callback' into 'master' Rémy Coutable2016-10-241-4/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | refactor(email): use setter method instead AR callbacksSemyon Pupkov2016-10-231-4/+2
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'origin/sh-flush-cache-after-import'Yorick Peterse2016-10-241-12/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove duplicate code in repository cache clearingsh-flush-cache-after-importStan Hu2016-10-231-8/+1
| * | | Expire and build repository cache after project importStan Hu2016-10-231-4/+14
| |/ /
* | | removes extra line for empty milestone description23557-remove-extra-line-for-empty-issue-descriptionNur Rony2016-10-242-2/+2
* | | code formatting correctedNur Rony2016-10-241-1/+1
* | | Merge branch 'master' into 23557-remove-extra-line-for-empty-issue-descriptionNur Rony2016-10-2466-184/+278
|\ \ \ | |/ /
| * | Merge branch 'ldap-login-styles' into 'master' Jacob Schatz2016-10-223-3/+35
| |\ \
| | * | Ensure custom provider tab labels don't break layout.ldap-login-stylesBryce Johnson2016-10-203-3/+35
| * | | Merge branch '22892-cycle-analytics-date-filter-is-not-working' into 'master' Fatih Acet2016-10-221-1/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Fix object data to be sent to fetch analytics dataAlfredo Sumaran2016-10-211-1/+5
| * | | Merge branch 'project-settings--features-weight' into 'master' Annabel Dunstone Gray2016-10-212-60/+72
| |\ \ \
| | * | | fix font weight of project feature settingsproject-settings--features-weighttauriedavis2016-10-202-60/+72
| | | |/ | | |/|
| * | | Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-2149-65/+97
| |\ \ \
| | * | | Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-2149-65/+97
| | | |/ | | |/|
| * | | Merge branch 'fix-bulk-assign-issues-for-external-issues' into 'master' Sean McGivern2016-10-211-1/+1
| |\ \ \
| | * | | Ignore external issues when bulk assigning issues to author of merge request.fix-bulk-assign-issues-for-external-issuesAdam Niedzielski2016-10-201-1/+1