summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* migrate projects:issues:new and projects:issues:edit to static bundleMike Greiling2018-02-163-16/+2
|
* migrate projects:branches:index to static bundleMike Greiling2018-02-162-7/+2
|
* migrate projects:branches:new to static bundleMike Greiling2018-02-162-11/+3
|
* migrate projects:compare:show to static bundleMike Greiling2018-02-162-7/+2
|
* migrate projects:environments:metrics to static bundleMike Greiling2018-02-162-6/+1
|
* migrate projects:milestones:* and groups:milestones:* to static bundleMike Greiling2018-02-165-28/+4
|
* migrate explore:groups:index to static bundleMike Greiling2018-02-162-7/+2
|
* migrate explore:projects:* to static bundleMike Greiling2018-02-162-8/+1
|
* migrate dashboard:projects:* to static bundleMike Greiling2018-02-162-27/+21
|
* migrate admin:jobs:index to static bundleMike Greiling2018-02-161-4/+2
|
* migrate dashboard:todos:index to static bundleMike Greiling2018-02-162-6/+1
|
* migrate groups:merge_requests to static bundleMike Greiling2018-02-162-7/+2
|
* migrate groups:issues to static bundleMike Greiling2018-02-162-7/+2
|
* migrate dashboard:merge_requests to static bundleMike Greiling2018-02-162-7/+2
|
* migrate dashboard:issues to static bundleMike Greiling2018-02-162-7/+2
|
* migrate dashboard:milestones:show to static bundleMike Greiling2018-02-162-7/+2
|
* migrate groups:milestones:show to static bundleMike Greiling2018-02-162-6/+1
|
* migrate projects:milestones:show to static bundleMike Greiling2018-02-162-7/+2
|
* migrate projects:milestones:index to static bundleMike Greiling2018-02-162-6/+1
|
* Merge branch '43201-rename-repository-submit-button-disabled' into 'master'Filipa Lacerda2018-02-152-2/+2
|\ | | | | | | | | | | | | Resolve "Renaming repository (project[name]) fails on 2nd try if the validation has failed" Closes #43201 See merge request gitlab-org/gitlab-ce!17150
| * Fixes Renaming repository (project[name]) fails on 2nd try whend the ↵Jacopo2018-02-152-2/+2
| | | | | | | | validation has failed
* | Merge branch 'winh-new-modal-component' into 'master'Filipa Lacerda2018-02-154-34/+142
|\ \ | | | | | | | | | | | | Add new modal Vue component See merge request gitlab-org/gitlab-ce!17108
| * | Add new modal Vue componentwinh-new-modal-componentWinnie Hellmann2018-02-144-34/+142
| | |
* | | Merge branch 'project-integrations-form-dispatcher-refactor' into 'master'Fatih Acet2018-02-153-7/+8
|\ \ \ | | | | | | | | | | | | | | | | Removed integrations webpack bundle tag See merge request gitlab-org/gitlab-ce!17147
| * | | Removed integrations webpack bundle tagproject-integrations-form-dispatcher-refactorConstance Okoghenun2018-02-153-7/+8
| | | |
* | | | Re-enable eslint in `commits.js` fileAndré Luís2018-02-152-46/+28
| | | |
* | | | Merge branch ↵Rémy Coutable2018-02-151-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40623-fix-404-when-listing-archived-projects-in-a-group-where-all-projects-have-been-archived' into 'master' Resolve "404 when listing archived projects in a group where all projects have been archived" Closes #40623 See merge request gitlab-org/gitlab-ce!17077
| * | | | Change group_children_path to filter_groups_path like for the sort order filterAshley Dumaine2018-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ashley Dumaine <adumaine@datto.com>
* | | | | Merge branch 'change/strip-whitespace-from-username-input#42637' into 'master'Rémy Coutable2018-02-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trim whitespace from input in the username/email form field Closes #42637 See merge request gitlab-org/gitlab-ce!17020
| * | | | | Strip whitespace from username/login value for user lookupPeter Lauck2018-02-131-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the discussion with @psimyn, this change does not affect the frontend, so user input will not be validated on the signin screen. Instead, the value sent to the backend has leading and trailing whitespace stripped before looking up the user with find_by. Closes #42637
* | | | | Merge branch 'pipeline-schedule-webpack' into 'master'Filipa Lacerda2018-02-1513-15/+19
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Converted pipeline_schedules bundles into automatic webpack entries See merge request gitlab-org/gitlab-ce!17143
| * | | | Converted pipeline_schedules bundles into automatic webpack entriespipeline-schedule-webpackPhil Hughes2018-02-1513-15/+19
| | |_|/ | |/| | | | | | | | | | #41341
* | | | Merge branch 'sh-fix-error-500-licensee' into 'master'Douwe Maan2018-02-151-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500s loading repositories with inconsistent HEAD Closes #43268 See merge request gitlab-org/gitlab-ce!17128
| * | | | Remove head_commit callsh-fix-error-500-licenseeStan Hu2018-02-141-1/+0
| | | | |
| * | | | Simplify license generator error handlingStan Hu2018-02-141-1/+1
| | | | |
| * | | | Remove use of catching Rugged exceptionsStan Hu2018-02-141-1/+4
| | | | |
| * | | | Fix Error 500s loading repositories with no master branchStan Hu2018-02-141-1/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We removed the exception handling for Rugged errors in !16770, which revealed that the licensee gem attempts to retrieve a license file via Rugged in `refs/heads/master` by default. If that branch did not exist, a Rugged::ReferenceError would be thrown. There were two issues: 1. Not every project uses `master` as the default branch. This change uses the head commit to identify the license. 2. Removing the exception handling caused repositories to fail loading. We can safely catch and ignore any Rugged error because this means we weren't able to load a license file. Closes #43268
* | | | Merge branch '39607-fix-avatar--vertical-align' into 'master'Tim Zallmann2018-02-151-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "CI status icon and avatar are not vertically aligned in MR list" Closes #39607 See merge request gitlab-org/gitlab-ce!17072
| * | | | fix author_link's vertical alignLaszlo Karpati2018-02-131-2/+0
| | |_|/ | |/| |
* | | | Fixed user synced attributes metadata after removing current providerFrancisco Javier López2018-02-151-0/+9
| |_|/ |/| |
* | | Merge branch '35530-teleporting-emoji-fix' into 'master'Fatih Acet2018-02-151-3/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix teleporting emoji (MR description instead of comment) Closes #35530 See merge request gitlab-org/gitlab-ce!17100
| * | | Don't reset the awards block when the emoji search is clickedJared Deckard2018-02-071-3/+1
| | | |
* | | | Merge branch '34130-null-pipes' into 'master'Fatih Acet2018-02-151-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve "Merge request says "Could not connect to the CI server", no CI or integration is configured" See merge request gitlab-org/gitlab-ce!17053
| * | | | Prevent MR Widget error when no CI configured34130-null-pipesSimon Knox2018-02-121-0/+1
| | | | |
* | | | | Merge branch 'mc/fix/project-variables-scope' into 'master'Kamil Trzciński2018-02-142-4/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project variables validate without any scopes disregarding environment_scope" Closes #43191 See merge request gitlab-org/gitlab-ce!17086
| * | | | | Improve validation message and add changelogmc/fix/project-variables-scopeKamil Trzciński2018-02-141-1/+1
| | | | | |
| * | | | | Refactor variable duplicates error messageMatija Čupić2018-02-141-1/+1
| | | | | |
| * | | | | Add more information in variable_duplicates validator error messageMatija Čupić2018-02-131-1/+3
| | | | | |
| * | | | | Refactor outer anonymous function into a do blockMatija Čupić2018-02-131-1/+3
| | | | | |
| * | | | | Disable public send cop in variables duplicates validatorMatija Čupić2018-02-131-1/+1
| | | | | |