Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add container registry repositories view specsfix/gb/improve-container-registry-clipboard-links | Grzegorz Bizon | 2017-04-10 | 1 | -0/+36 |
| | |||||
* | Add method that returns location of registry image | Grzegorz Bizon | 2017-04-10 | 1 | -0/+7 |
| | |||||
* | Improve test examples for container repository class | Grzegorz Bizon | 2017-04-10 | 1 | -21/+21 |
| | |||||
* | Add method that returns a registry repository location | Grzegorz Bizon | 2017-04-10 | 1 | -0/+15 |
| | |||||
* | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-07 | 10 | -116/+261 |
|\ | |||||
| * | Merge branch 'adam-finish-5993-closed-issuable' into 'master' | Douwe Maan | 2017-04-07 | 8 | -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-issuable | Adam Buckland | 2017-04-07 | 8 | -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 Gray | 2017-04-07 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | Put back usernames in activity and profile feed See merge request !10539 | ||||
| | * | | Put back usernames in activity and profile feed | Annabel Dunstone Gray | 2017-04-07 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'feature/add-rake-task-prints-storage-config-in-toml' into ↵ | Robert Speicher | 2017-04-07 | 1 | -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-toml | Ahmad Sherif | 2017-04-04 | 1 | -0/+32 |
| | | | | | | | | | | | | | | | | Closes gitaly#173 | ||||
* | | | | Fix specs | Douwe Maan | 2017-04-07 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 31 | -146/+690 |
|\ \ \ \ | |/ / / | |||||
| * | | | Remove Vue from main bundle and disable production warnings | Mike Greiling | 2017-04-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch ↵ | Sean McGivern | 2017-04-07 | 4 | -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 config | Sean McGivern | 2017-04-07 | 1 | -0/+2 |
| | | | | |||||
| | * | | Fix last spec failure | Kamil Trzcinski | 2017-04-07 | 1 | -1/+6 |
| | | | | |||||
| | * | | Fix spec failure | Kamil Trzcinski | 2017-04-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Yet, another errorsdosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui | Kamil Trzcinski | 2017-04-07 | 1 | -1/+4 |
| | | | | |||||
| | * | | Another round of code review | Kamil Trzcinski | 2017-04-07 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix test failures | Kamil Trzcinski | 2017-04-07 | 1 | -0/+1 |
| | | | | |||||
| | * | | Update tests to cover trigger schedule | Kamil Trzcinski | 2017-04-07 | 3 | -20/+73 |
| | | | | |||||
| | * | | Fix ref reference | Kamil Trzcinski | 2017-04-07 | 1 | -0/+4 |
| | | | | |||||
| | * | | before_create :set_project. Now TriggerSchedule saves project from parent | Shinya Maeda | 2017-04-07 | 1 | -4/+0 |
| | | | | |||||
| | * | | Add specs in triggers_spec.rb (Halfway) | Shinya Maeda | 2017-04-07 | 1 | -0/+8 |
| | | | | |||||
| * | | | Merge branch 'optimise-builds' into 'master' | Sean McGivern | 2017-04-07 | 1 | -0/+33 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise Pipelines > Jobs index controller Closes #27389 See merge request !10546 | ||||
| | * | | | Count number of queries | Kamil Trzcinski | 2017-04-07 | 1 | -0/+33 |
| | |/ / | |||||
| * | | | Merge branch 'karma-failure-fix' into 'master' | Jacob Schatz | 2017-04-07 | 1 | -4/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed duplicate jQuery AJAX spyon See merge request !10531 | ||||
| | * | | | Fixed duplicate jQuery AJAX spyonkarma-failure-fix | Phil Hughes | 2017-04-07 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' | Kamil Trzciński | 2017-04-07 | 7 | -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-cache | Bob Van Landuyt | 2017-04-07 | 2 | -12/+8 |
| | | | | | | |||||
| | * | | | | Take the ref of a pipeline into account when caching status | Bob Van Landuyt | 2017-04-07 | 1 | -8/+11 |
| | | | | | | |||||
| | * | | | | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus` | Bob Van Landuyt | 2017-04-07 | 4 | -4/+4 |
| | | | | | | |||||
| | * | | | | Wrap updating of cache after pipeline transition in class method | Bob Van Landuyt | 2017-04-07 | 2 | -6/+16 |
| | | | | | | |||||
| | * | | | | Update project build status cache when transitioning | Bob Van Landuyt | 2017-04-07 | 3 | -8/+12 |
| | | | | | | |||||
| | * | | | | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatus | Bob Van Landuyt | 2017-04-07 | 4 | -5/+10 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' | Douwe Maan | 2017-04-07 | 20 | -103/+524 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356 | ||||
| | * | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 78 | -987/+4174 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml | ||||
| | * \ \ \ | Merge branch '18471-restrict-tag-pushes-protected-tags' of ↵ | Kushal Pandya | 2017-04-07 | 23 | -72/+643 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into 18471-restrict-tag-pushes-protected-tags | ||||
| | | * \ \ \ | Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags | James Edwards-Jones | 2017-04-06 | 23 | -72/+643 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Fix within('#new_protected_tag') in protected tags spec | James Edwards-Jones | 2017-04-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fix selector for form wrapper | Kushal Pandya | 2017-04-07 | 1 | -2/+2 |
| | |/ / / / / | |||||
| | * | | | | | Protected Tags backend review changes | James Edwards-Jones | 2017-04-06 | 8 | -2/+73 |
| | | | | | | | | | | | | | | | | | | | | | Added changelog | ||||
| | * | | | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 401 | -2074/+7962 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss | ||||
| | * | | | | | | Added ProtectedTag to import/export son and safe_model_attributes | James Edwards-Jones | 2017-04-04 | 3 | -0/+36 |
| | | | | | | | | |||||
| | * | | | | | | Renamed ProtectedTag push_access_levels to create_access_levels | James Edwards-Jones | 2017-04-04 | 6 | -20/+21 |
| | | | | | | | | |||||
| | * | | | | | | Cleaned up duplication with ProtectedRefAccess concern | James Edwards-Jones | 2017-04-04 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Attempt to fix import/export of push_access_levels for protected tags | James Edwards-Jones | 2017-04-04 | 1 | -0/+5 |
| | | | | | | | | |||||
| | * | | | | | | Cleanup & tests for UserAccess#can_create_tag? | James Edwards-Jones | 2017-04-04 | 1 | -0/+70 |
| | | | | | | | | |||||
| | * | | | | | | Protected Tags prevents all updates instead of just force pushes. | James Edwards-Jones | 2017-04-04 | 1 | -45/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | This only changes behaviour for masters, as developers are already prevented from updating/deleting tags without the Protected Tags feature |