summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Separate examples for each otherimprove-discussions-feature-attempt-1Luke "Jared" Bennett2017-04-125-64/+66
|
* Collapse similar sibling scenariosLuke "Jared" Bennett2017-04-121-41/+12
|
* Use empty_project for resources that are independent of the repoLuke "Jared" Bennett2017-04-121-7/+18
|
* Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-114-3/+87
|\ | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
| * Add specsDouwe Maan2017-04-104-2/+86
| |
| * Some code tweaksDouwe Maan2017-04-081-1/+1
| |
| * Fix specs and make tweaksDouwe Maan2017-04-081-2/+2
| |
* | Merge branch '28017-separate-ce-params-on-api' into 'master' Douwe Maan2017-04-111-0/+7
|\ \ | | | | | | | | | | | | | | | | | | Resolve "API: Separate CE params to avoid wrong conflict resolutions" Closes #28017 See merge request !10484
| * | Separate CE params on Grape APIOswaldo Ferreira2017-04-101-0/+7
| | |
* | | Merge branch 'rs-remove-open-for-scope' into 'master' test-branch-nameDouwe Maan2017-04-111-9/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove unused scopes See merge request !10609
| * | | Remove an unused `Issue.open_for` scopeRobert Speicher2017-04-101-9/+0
| | | |
* | | | Merge branch 'dz-fix-project-view' into 'master' Annabel Dunstone Gray2017-04-112-2/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change project view default for existing users and anonymous visitors to files+readme Closes #29926 See merge request !10498
| * | | | Change project view default for existing users and anonymous visitors to ↵dz-fix-project-viewDmitriy Zaporozhets2017-04-102-2/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'signed-out-menu-shortcuts' into 'master' Jacob Schatz2017-04-111-13/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added keyboard shortcuts to signed out menu See merge request !10526
| * | | | Added keyboard shortcuts to signed out menusigned-out-menu-shortcutsPhil Hughes2017-04-101-13/+35
| | | | |
* | | | | Merge branch 'mr-widget-bug-fix' into 'master' Stan Hu2017-04-111-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the MR widget that merged any MR when choosing the option "Merge when pipeline succeeds" from the dropdown Closes #29568 See merge request !10611
| * | | | | Added tests and fixed a typoJose Ivan Vargas2017-04-101-0/+13
| | | | | |
* | | | | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-113-20/+78
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587
| * | | | | Add container registry repositories view specsfix/gb/improve-container-registry-clipboard-linksGrzegorz Bizon2017-04-101-0/+36
| | | | | |
| * | | | | Add method that returns location of registry imageGrzegorz Bizon2017-04-101-0/+7
| | | | | |
| * | | | | Improve test examples for container repository classGrzegorz Bizon2017-04-101-21/+21
| | | | | |
| * | | | | Add method that returns a registry repository locationGrzegorz Bizon2017-04-101-0/+15
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix_cache_expiration_in_repository' into 'master' Robert Speicher2017-04-101-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix redundant cache expiration in Repository Closes #30146 See merge request !10575
| * | | | | Fix redundant cache expiration in Repositoryblackst0ne2017-04-101-2/+0
| |/ / / /
* | | | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-101-5/+5
| | | | |
* | | | | Merge branch '1595-ee-backport-environments-tests' into 'master' Clement Ho2017-04-102-4/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Backport of EE changes in environments tests See merge request !10528
| * | | | Backport of EE changes in environments tests1595-ee-backport-environments-testsFilipa Lacerda2017-04-072-4/+6
| | | | |
* | | | | Merge branch 'backport-ee-1525' into 'master' Robert Speicher2017-04-104-50/+195
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport Git-env code from EE "Fix push rules on Git 2.11" (gitlab-org/gitlab-ee!1525) See merge request !10547
| * | | | | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable2017-04-101-48/+44
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable2017-04-101-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Set Git-specific env in /api/internal/allowedRémy Coutable2017-04-101-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-101-0/+102
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'add-vue-loader' into 'master' Filipa Lacerda2017-04-103-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add vue loader Closes #29519 See merge request !10517
| * | | | convert pipeline async_button component to vue templateMike Greiling2017-04-091-1/+1
| | | | |
| * | | | convert pipeline error state to vue templateMike Greiling2017-04-091-1/+1
| | | | |
| * | | | convert pipeline empty state to vue templateMike Greiling2017-04-091-1/+1
| | | | |
* | | | | Merge branch 'ci-favicon-back-in' into 'master' Filipa Lacerda2017-04-101-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added back in the CI status favicon See merge request !10534
| * | | | | Fixed karmaci-favicon-back-inPhil Hughes2017-04-101-3/+3
| |/ / / /
* | | | | Merge branch 'spec_for_schema' into 'master' Rémy Coutable2017-04-101-0/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Add spec for schema.rb Closes #21978 See merge request !10580
| * | | | Add spec for schema.rbblackst0ne2017-04-101-0/+23
| |/ / /
* | | | Merge branch 'test-all-etag-routes' into 'master' Sean McGivern2017-04-101-0/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test all enabled routes in ETag caching middleware and fix pipeline routes Closes #30563 See merge request !10535
| * | | | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routesAdam Niedzielski2017-04-101-0/+83
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract route matching logic to Gitlab::EtagCaching::Router. Fix pipeline routes: 1. "project_pipelines" has to come after "commit_pipelines" and "merge_request_pipelines" because it is more generic 2. "commit_pipelines": "\s" (any whitespace character) => "\S" (any non-whitespace character).
* | | | Merge branch '30676-project-export-email' into 'master' Sean McGivern2017-04-101-0/+16
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix email not being sent after project export Closes #30676 See merge request !10578
| * | | Fix email not being sent after project exportmhasbini2017-04-091-0/+16
| | |/ | |/|
* | | Merge branch 'remove_is_admin' into 'master' Robert Speicher2017-04-093-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove the `User#is_admin?` method Closes #30584 See merge request !10520
| * | | Remove the User#is_admin? methodblackst0ne2017-04-093-6/+6
| |/ /
* | | Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-093-12/+43
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables user specification of group name vs. name inferred from group path. Cause new group form to copy name from path Adds some new page-specific javascript that copies entry from the group path field to the group name field when the group name field is initially empty. Remove duplicate group name entry field on group edit form This corrects the duplicated name entry field and tests that the JavaScript does not update the group name field if the user edits the group path. (Editing the group path is not recommended in any case, but it is possible.) Address eslint errors in group.js Enable group name copy with dispatch and explore group creation The dispatch and explore group creation forms require the group.js asset, and their tests now require testing against poltergeist Update workflow new group instruction Update the gitlab basics group creation document Add a change log entry Remove unused variable for eslint
* | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0710-116/+261
|\ \
| * \ Merge branch 'adam-finish-5993-closed-issuable' into 'master' Douwe Maan2017-04-078-113/+226
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add indication for closed or merged issuables in GFM Closes #1369 See merge request !9462
| | * | Add indication for closed or merged issuables in GFMadam-finish-5993-closed-issuableAdam Buckland2017-04-078-113/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: for issues that are closed, the links will now show '[closed]' following the issue number. This is done as post-process after the markdown has been loaded from the cache as the status of the issue may change between the cache being populated and the content being displayed. In order to avoid N+1 queries problem when rendering notes ObjectRenderer populates the cache of referenced issuables for all notes at once, before the post processing phase. As a part of this change, the Banzai BaseParser#grouped_objects_for_nodes method has been refactored to return a Hash utilising the node itself as the key, since this was a common pattern of usage for this method.