Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Retrieve Git-specific env in Gitlab::Git::Repository#rugged | Rémy Coutable | 2017-04-10 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | Set Git-specific env in /api/internal/allowed | Rémy Coutable | 2017-04-10 | 2 | -18/+12 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | Add a Gitlab::Git::Env to store Git-specific env thread-safely | Rémy Coutable | 2017-04-10 | 1 | -0/+38 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
* | | | | Merge branch 'merge-request-parser-merge-requests-for-nodes' into 'master' | Douwe Maan | 2017-04-10 | 1 | -11/+30 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Reuse "merge_requests_for_nodes" in "MergeRequestParser" See merge request !10585 | |||||
| * | | | Reuse "merge_requests_for_nodes" in "MergeRequestParser"merge-request-parser-merge-requests-for-nodes | Adam Niedzielski | 2017-04-10 | 1 | -11/+30 | |
| | |/ | |/| | ||||||
* | | | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routes | Adam Niedzielski | 2017-04-10 | 2 | -34/+41 | |
|/ / | | | | | | | | | | | | | | | | | | | 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). | |||||
* | | Remove the User#is_admin? method | blackst0ne | 2017-04-09 | 13 | -22/+22 | |
|/ | ||||||
* | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-07 | 10 | -40/+138 | |
|\ | ||||||
| * | Merge branch 'adam-finish-5993-closed-issuable' into 'master' | Douwe Maan | 2017-04-07 | 9 | -40/+124 | |
| |\ | | | | | | | | | | | | | | | | | | | 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 | 9 | -40/+124 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'feature/add-rake-task-prints-storage-config-in-toml' into ↵ | Robert Speicher | 2017-04-07 | 1 | -0/+14 | |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | '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/+14 | |
| | | | | | | | | | | | | Closes gitaly#173 | |||||
* | | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 8 | -23/+169 | |
|\ \ \ | |/ / | ||||||
| * | | Fix rake test to import Github repositories | Douglas Barbosa Alexandre | 2017-04-07 | 1 | -2/+9 | |
| | | | ||||||
| * | | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' | Kamil Trzciński | 2017-04-07 | 1 | -0/+103 | |
| |\ \ | | | | | | | | | | | | | | | | | Fix invalidating Project build status cache to often See merge request !10313 | |||||
| | * | | Take the ref of a pipeline into account when caching status | Bob Van Landuyt | 2017-04-07 | 1 | -9/+18 | |
| | | | | ||||||
| | * | | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus` | Bob Van Landuyt | 2017-04-07 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Wrap updating of cache after pipeline transition in class method | Bob Van Landuyt | 2017-04-07 | 1 | -0/+4 | |
| | | | | ||||||
| | * | | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatus | Bob Van Landuyt | 2017-04-07 | 1 | -0/+90 | |
| | | | | ||||||
| * | | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' | Douwe Maan | 2017-04-07 | 6 | -21/+57 | |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356 | |||||
| | * | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 24 | -151/+533 | |
| | |\ \ | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml | |||||
| | * \ \ | Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags | James Edwards-Jones | 2017-04-06 | 12 | -23/+279 | |
| | |\ \ \ | ||||||
| | * | | | | Fix projected import failing on missing relations | James Edwards-Jones | 2017-04-06 | 1 | -1/+5 | |
| | | | | | | ||||||
| | * | | | | Protected Tags backend review changes | James Edwards-Jones | 2017-04-06 | 1 | -8/+2 | |
| | | | | | | | | | | | | | | | | | | Added changelog | |||||
| | * | | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 77 | -359/+1041 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss | |||||
| | * | | | | | Fixed UserAccess#can_create_tag? after create_access_levels rename | James Edwards-Jones | 2017-04-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Renamed ProtectedTag push_access_levels to create_access_levels | James Edwards-Jones | 2017-04-04 | 2 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | Attempt to fix import/export of push_access_levels for protected tags | James Edwards-Jones | 2017-04-04 | 2 | -1/+4 | |
| | | | | | | | ||||||
| | * | | | | | Cleanup & tests for UserAccess#can_create_tag? | James Edwards-Jones | 2017-04-04 | 2 | -8/+5 | |
| | | | | | | | ||||||
| | * | | | | | Fixed developers_can_push in RepoBranch API entity | James Edwards-Jones | 2017-04-04 | 1 | -6/+2 | |
| | | | | | | | ||||||
| | * | | | | | Protected Tags prevents all updates instead of just force pushes. | James Edwards-Jones | 2017-04-04 | 1 | -5/+9 | |
| | | | | | | | | | | | | | | | | | | | | | This only changes behaviour for masters, as developers are already prevented from updating/deleting tags without the Protected Tags feature | |||||
| | * | | | | | Clean up non TODO rubocop errors | James Edwards-Jones | 2017-04-03 | 2 | -5/+5 | |
| | | | | | | | ||||||
| | * | | | | | Moved Project#protected_branch? to ProtectedBranch, similar for tags | James Edwards-Jones | 2017-04-03 | 3 | -6/+6 | |
| | | | | | | | ||||||
| | * | | | | | Extract ProtectedRef Concern | James Edwards-Jones | 2017-04-03 | 2 | -10/+5 | |
| | | | | | | | ||||||
| | * | | | | | Added ‘protected’ label and disabled delete button for tags index/show | James Edwards-Jones | 2017-03-31 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Protected Tags enforced over git | James Edwards-Jones | 2017-03-31 | 2 | -5/+48 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 15 | -39/+311 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge branch 'gitaly-repository-message' into 'master' | Sean McGivern | 2017-04-07 | 7 | -38/+41 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send more Gitaly::Repository fields See merge request !10499 | |||||
| | * | | | | | | Use Gitlab::Git::Repository#gitaly_... more | Jacob Vosmaer | 2017-04-07 | 5 | -19/+15 | |
| | | | | | | | | ||||||
| | * | | | | | | Remove spaces | Jacob Vosmaer | 2017-04-07 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | Remove unused code | Jacob Vosmaer | 2017-04-07 | 1 | -4/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | Send more Gitaly::Repository fields | Jacob Vosmaer | 2017-04-07 | 6 | -25/+36 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'feature/service-desk-be-backport' into 'master' | Sean McGivern | 2017-04-07 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Backport permissions and multi-line array to CE See merge request !10507 | |||||
| | * | | | | | | Backport permissions and multi-line array to CE | Felipe Artur | 2017-04-07 | 1 | -1/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track ↵ | Paweł Chojnacki | 2017-04-07 | 7 | -0/+265 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application readiness | |||||
* | | | | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 1 | -1/+17 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Enable polling for pipelines table other pages | Toon Claes | 2017-04-06 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also poll for pipeline changes on: - Pipeline table on commit page - Pipeline table on merge request page - Pipeline table on new merge request page | |||||
| * | | | | | | | In case of Etag cache hit, the body should be empty | Toon Claes | 2017-04-06 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Use Etag caching for pipelines json | Toon Claes | 2017-04-06 | 1 | -0/+4 | |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Enable caching in the Etag::Middleware and when a pipeline changes status, expire the cache for the project pipelines path. | |||||
* | | | | | | | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-06 | 26 | -167/+765 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml |