summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix broken variable referenceremove-iifes-1Mike Greiling2017-03-131-1/+1
|
* remove IIFEs in preparation for ES module refactorMike Greiling2017-03-1335-3748/+3683
|
* Merge branch '24501-new-file-existing-branch' into 'master'Sean McGivern2017-03-1322-18/+710
|\ | | | | | | | | | | | | New file from interface on existing branch Closes #24501 See merge request !8427
| * New file from interface on existing branchJacopo2017-03-1322-18/+710
| | | | | | | | | | | | Now you can create a new file and select a target_branch != source_branch. If the file that you want to create already exists on the target branch an error message is shown A glDropdown is used to select and create a new branch instead of a text field.
* | Merge branch 'license-file-9-0' into 'master' Robert Speicher2017-03-131-0/+945
|\ \ | | | | | | | | | | | | Add the generated license.csv for 9.0 See merge request !9826
| * | Move licenses file under the vendor folderlicense-file-9-0DJ Mountney2017-03-121-0/+0
| | |
| * | Add the generated license.csv for 9.0DJ Mountney2017-03-081-0/+945
| | |
* | | Merge branch 'dz-blacklist--names' into 'master' Douwe Maan2017-03-135-2/+155
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Blacklist nested groups and project names that can cause ambiguous routing for HA Closes #29324 See merge request !9898
| * | | Reserve few project and nested group pathsDmitriy Zaporozhets2017-03-135-2/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | That have wildcard routes associated and not reserved yet: artifacts, graphs, badges and refs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'pages-0.4.0' into 'master' Robert Speicher2017-03-132-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use GitLab Pages v0.4.0 See merge request !9896
| * | | | Use GitLab Pages v0.4.0Nick Thomas2017-03-132-1/+5
| |/ / /
* | | | Merge branch 'workhorse-1.4.1' into 'master' Sean McGivern2017-03-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 1.4.1 See merge request !9900
| * | | | Use gitlab-workhorse 1.4.1Jacob Vosmaer2017-03-131-1/+1
| |/ / /
* | | | Merge branch '27114-add-undo-to-todos-in-the-done-tab' into 'master' Sean McGivern2017-03-134-127/+169
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Undo' to Todos in the Done tab Closes #27114 See merge request !8782
| * | | | Add 'Undo' to Todos in the Done tabJacopo2017-03-104-127/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to 'Undo' the todos marked complete in the 'Done' tab of the Todo dashboard. Added the ability to 'Undo mark all as done' todos marked complete with 'Mark all as done' in the 'Todo' tab of the Todo dashboard.
* | | | | Merge branch 'feature/gb/gitlab-qa-integration-tests' into 'master' Grzegorz Bizon2017-03-1333-0/+897
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab QA integrations tests to GitLab CE / EE Closes gitlab-qa#30 See merge request !9370
| * | | | | Add GitLab QA CE strategy and simplify inflectorfeature/gb/gitlab-qa-integration-testsGrzegorz Bizon2017-03-134-61/+35
| | | | | |
| * | | | | Fix user menu selector in GitLab QA test suiteGrzegorz Bizon2017-03-131-1/+1
| | | | | |
| * | | | | Do not use GITLAB_RELEASE env to define QA strategyGrzegorz Bizon2017-03-133-34/+36
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Fix GitLab QA release inflector strategyGrzegorz Bizon2017-03-092-1/+7
| | | | | |
| * | | | | Remove unused tags in GitLab QA feature specsGrzegorz Bizon2017-03-095-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Remove EE classes from GitLab QA merged into CEGrzegorz Bizon2017-03-094-48/+3
| | | | | |
| * | | | | Fix using release inflector to define autoloadsGrzegorz Bizon2017-03-091-1/+3
| | | | | |
| * | | | | Implement GitLab QA release inflection strategyGrzegorz Bizon2017-03-093-0/+110
| | | | | |
| * | | | | Add env var that describes QA release to DockerfileGrzegorz Bizon2017-03-091-0/+2
| | | | | |
| * | | | | Extend README.md for GitLab QA in `qa/` directoryGrzegorz Bizon2017-03-091-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Fix Rubocop offense and remove QA Rubocop from depsGrzegorz Bizon2017-03-092-2/+1
| | | | | |
| * | | | | Remove blank line from GitLab QA DockerfileGrzegorz Bizon2017-03-091-1/+0
| | | | | |
| * | | | | Extend README for GitLab QA files in `qa/`Grzegorz Bizon2017-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Remove legacy scripts for building docker imagesGrzegorz Bizon2017-03-091-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Add GitLab QA integrations tests to GitLab CE / EEGrzegorz Bizon2017-03-0933-0/+859
| | | | | |
* | | | | | Merge branch 'adam-backport-ee-1406' into 'master' Douwe Maan2017-03-133-5/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!1406 See merge request !9897
| * | | | | | Backport changes from gitlab-org/gitlab-ee!1406adam-backport-ee-1406Adam Niedzielski2017-03-133-5/+19
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'refresh-permissions-recent-users' into 'master' Rémy Coutable2017-03-132-0/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Trigger refreshing of permissions in a migration See merge request !8914
| * | | | | Trigger refreshing of permissions in a migrationrefresh-permissions-recent-usersYorick Peterse2017-03-132-0/+23
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This migration resets `users.authorized_projects_populated` (in batches) so that active users' permissions are refreshed on the next request. This ensures that their permissions are properly stored.
* | | | | Merge branch '28385-27189-tech-debt-dropdown' into 'master' Fatih Acet2017-03-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Simplify jQuery selector See merge request !9881
| * | | | | Simplify selector28385-27189-tech-debt-dropdownFilipa Lacerda2017-03-101-1/+1
| | | | | |
* | | | | | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' Sean McGivern2017-03-1321-65/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor/global permissions for internal users See merge request !9598
| * | | | | | allow internal attributes to have a nil valuerefactor/global-permissions-for-internal-usershttp://jneen.net/2017-03-101-1/+1
| | | | | | |
| * | | | | | mark internal users in the admin panelhttp://jneen.net/2017-03-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and don't offer to impersonate them
| * | | | | | reverse the logic and use a clearer namehttp://jneen.net/2017-03-091-7/+7
| | | | | | |
| * | | | | | get the logic right :Xhttp://jneen.net/2017-03-091-1/+1
| | | | | | |
| * | | | | | add .internal and .non_internal scopeshttp://jneen.net/2017-03-091-1/+13
| | | | | | |
| * | | | | | consolidate the error handling for #impersonatehttp://jneen.net/2017-03-091-9/+12
| | | | | | |
| * | | | | | add a spec that the ghost user cannot log inhttp://jneen.net/2017-03-091-0/+12
| | | | | | |
| * | | | | | spec the new behavior of .class_forhttp://jneen.net/2017-03-091-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and more robustly spec the ancestor behavior
| * | | | | | spec the behavior of nil subjectshttp://jneen.net/2017-03-091-0/+6
| | | | | | |
| * | | | | | fix a brittle stubhttp://jneen.net/2017-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | true is neither nil nor a user and doesn't make sense as the return value of `current_user`
| * | | | | | use policies to protect sending emailhttp://jneen.net/2017-03-092-1/+2
| | | | | | |
| * | | | | | don't require ghost users to be blockedhttp://jneen.net/2017-03-092-23/+0
| | | | | | |
View Lorry Controller Status