summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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.
| * | Merge branch 'activity-feed-user-name' into 'master' Annabel Dunstone Gray2017-04-071-3/+3
| |\ \ | | | | | | | | | | | | | | | | Put back usernames in activity and profile feed See merge request !10539
| | * | Put back usernames in activity and profile feedAnnabel Dunstone Gray2017-04-071-3/+3
| | | |
| * | | Merge branch 'feature/add-rake-task-prints-storage-config-in-toml' into ↵Robert Speicher2017-04-071-0/+32
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add rake task that prints TOML storage configuration Closes gitaly#173 See merge request !10448
| | * | Add rake task that prints TOML storage configurationfeature/add-rake-task-prints-storage-config-in-tomlAhmad Sherif2017-04-041-0/+32
| | | | | | | | | | | | | | | | Closes gitaly#173
* | | | Fix specsDouwe Maan2017-04-072-2/+2
| | | |
* | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0731-146/+690
|\ \ \ \ | |/ / /
| * | | Remove Vue from main bundle and disable production warningsMike Greiling2017-04-071-0/+1
| | | |
| * | | Merge branch ↵Sean McGivern2017-04-074-10/+82
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui' into 'master' Add "engineering" UI for Pipeline Schedule See merge request !10533
| | * | Add ref and active to import/export configSean McGivern2017-04-071-0/+2
| | | |
| | * | Fix last spec failureKamil Trzcinski2017-04-071-1/+6
| | | |
| | * | Fix spec failureKamil Trzcinski2017-04-071-1/+1
| | | |
| | * | Yet, another errorsdosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-uiKamil Trzcinski2017-04-071-1/+4
| | | |
| | * | Another round of code reviewKamil Trzcinski2017-04-071-2/+2
| | | |
| | * | Fix test failuresKamil Trzcinski2017-04-071-0/+1
| | | |
| | * | Update tests to cover trigger scheduleKamil Trzcinski2017-04-073-20/+73
| | | |
| | * | Fix ref referenceKamil Trzcinski2017-04-071-0/+4
| | | |
| | * | before_create :set_project. Now TriggerSchedule saves project from parentShinya Maeda2017-04-071-4/+0
| | | |
| | * | Add specs in triggers_spec.rb (Halfway)Shinya Maeda2017-04-071-0/+8
| | | |
| * | | Merge branch 'optimise-builds' into 'master' Sean McGivern2017-04-071-0/+33
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise Pipelines > Jobs index controller Closes #27389 See merge request !10546
| | * | | Count number of queriesKamil Trzcinski2017-04-071-0/+33
| | |/ /
| * | | Merge branch 'karma-failure-fix' into 'master' Jacob Schatz2017-04-071-4/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fixed duplicate jQuery AJAX spyon See merge request !10531
| | * | | Fixed duplicate jQuery AJAX spyonkarma-failure-fixPhil Hughes2017-04-071-4/+3
| | | | |
| * | | | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-077-29/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix invalidating Project build status cache to often See merge request !10313
| | * | | | Use `Ci::ExpirePipelineCacheService` to set `ProjectPipelinestatus`bvl-fix-project-ci-status-cacheBob Van Landuyt2017-04-072-12/+8
| | | | | |
| | * | | | Take the ref of a pipeline into account when caching statusBob Van Landuyt2017-04-071-8/+11
| | | | | |
| | * | | | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-074-4/+4
| | | | | |
View Lorry Controller Status