Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix regression in rendering Markdown references that do not existsh-fix-base-parser | Stan Hu | 2017-04-15 | 1 | -2/+21 |
| | | | | Closes #30972 | ||||
* | Merge branch 'fix-appending-state-to-issuable-references' into 'master' | Robert Speicher | 2017-04-13 | 1 | -11/+32 |
|\ | | | | | | | | | | | | | Fix appending state to issuable references Closes #30874 See merge request !10683 | ||||
| * | Fix appending state to issuable referencesfix-appending-state-to-issuable-references | Adam Niedzielski | 2017-04-13 | 1 | -11/+32 |
| | | | | | | | | | | | | | | Closes #30874. Ignore nodes with no children. Append directly to the node instead of the last child of the node to avoid inheriting formatting from the last child | ||||
* | | Merge branch 'fix-trace-seeking-readline' into 'master' | Kamil Trzciński | 2017-04-13 | 1 | -4/+24 |
|\ \ | | | | | | | | | | | | | | | | | | | After Trace#limit, we seek to the next line in case Closes #30796 See merge request !10681 | ||||
| * | | Update tests for the fact that we would skip one linefix-trace-seeking-readline | Lin Jen-Shin | 2017-04-13 | 1 | -3/+3 |
| | | | |||||
| * | | After Trace#limit, we seek to the next line in case | Lin Jen-Shin | 2017-04-13 | 1 | -1/+21 |
| |/ | | | | | | | of breaking ANSI sequence or Unicode | ||||
* | | Fix registry for projects with uppercases in path | Grzegorz Bizon | 2017-04-13 | 1 | -3/+19 |
|/ | |||||
* | Revert "Fix registry for projects with uppercases in path" | Grzegorz Bizon | 2017-04-13 | 1 | -19/+3 |
| | | | | This reverts commit 22726942fe0b6c11c20de070cc9784de12ca2ce6. | ||||
* | Fix registry for projects with uppercases in path | Grzegorz Bizon | 2017-04-13 | 1 | -3/+19 |
| | |||||
* | Merge branch 'zero-downtime-migrations' into 'master' | Douwe Maan | 2017-04-12 | 2 | -0/+429 |
|\ | | | | | | | | | Prepare for zero downtime migrations See merge request !9976 | ||||
| * | Prepare for zero downtime migrationszero-downtime-migrations | Yorick Peterse | 2017-04-12 | 2 | -0/+429 |
| | | | | | | | | | | | | | | Starting with GitLab 9.1.0 we will no longer allow downtime migrations unless absolutely necessary. This commit updates the various developer guides and adds code that is necessary to make zero downtime migrations less painful. | ||||
* | | Merge branch '29056-backport-ee-cleanup-database-file' into 'master' | Douwe Maan | 2017-04-12 | 2 | -4/+48 |
|\ \ | | | | | | | | | | | | | | | | | | | removes redundant code from database.rb Closes #29056 See merge request !10583 | ||||
| * | | removes redundant code from database.rb29056-backport-ee-cleanup-database-file | Tiago Botelho | 2017-04-11 | 2 | -4/+48 |
| | | | |||||
* | | | Merge branch 'zj-fix-coverage-bug' into 'master' | Kamil Trzciński | 2017-04-12 | 2 | -7/+19 |
|\ \ \ | |_|/ |/| | | | | | | | | Return nil as coverage instead of a File object See merge request !10633 | ||||
| * | | Return nil as coverage instead of a File objectzj-fix-coverage-bug | Z.J. van de Weg | 2017-04-12 | 2 | -7/+19 |
| |/ | | | | | | | | | | | | | | | | | Given a valid pipeline job, and a regex which wouldn't match to a jobs trace, the stream of the trace would return the File object. This was not the case when it matched a value, as that would have been return from the block. Now the `extract_coverage` method returns `nil` if no match was found. | ||||
* | | Merge branch 'gitaly-testing' into 'master' | Rémy Coutable | 2017-04-12 | 1 | -42/+45 |
|\ \ | |/ |/| | | | | | Setup and run a Gitaly server for testing if GitalyClient is enabled See merge request !10298 | ||||
| * | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testing | Alejandro Rodríguez | 2017-04-11 | 1 | -42/+45 |
| | | |||||
* | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' | Kamil Trzciński | 2017-04-11 | 1 | -0/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587 | ||||
| * | | Add method that returns location of registry image | Grzegorz Bizon | 2017-04-10 | 1 | -0/+7 |
| |/ | |||||
* | | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs method | Rémy Coutable | 2017-04-10 | 1 | -48/+44 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Retrieve Git-specific env in Gitlab::Git::Repository#rugged | Rémy Coutable | 2017-04-10 | 1 | -0/+30 |
| | | | | | | | | 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/+102 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routes | Adam Niedzielski | 2017-04-10 | 1 | -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 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-07 | 7 | -113/+222 |
|\ | |||||
| * | Merge branch 'adam-finish-5993-closed-issuable' into 'master' | Douwe Maan | 2017-04-07 | 7 | -113/+222 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | 7 | -113/+222 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 7 | -23/+359 |
|\ \ \ | |/ / | |||||
| * | | Merge branch ↵ | Sean McGivern | 2017-04-07 | 1 | -0/+2 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | '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 |
| | | | |||||
| * | | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' | Kamil Trzciński | 2017-04-07 | 1 | -0/+190 |
| |\ \ | | | | | | | | | | | | | | | | | 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 | -8/+11 |
| | | | | |||||
| | * | | 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/+14 |
| | | | | |||||
| | * | | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatus | Bob Van Landuyt | 2017-04-07 | 1 | -0/+173 |
| | |/ | |||||
| * | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' | Douwe Maan | 2017-04-07 | 6 | -23/+167 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356 | ||||
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 14 | -239/+1027 |
| | |\ | | | | | | | | | | | | | # 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 | 4 | -9/+64 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 56 | -146/+686 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | 3 | -3/+4 |
| | | | | | | |||||
| | * | | | | 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 | ||||
| | * | | | | Moved Project#protected_branch? to ProtectedBranch, similar for tags | James Edwards-Jones | 2017-04-03 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Protected Tags enforced over git | James Edwards-Jones | 2017-03-31 | 1 | -1/+41 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 7 | -3/+208 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Use Gitlab::Git::Repository#gitaly_... more | Jacob Vosmaer | 2017-04-07 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Send more Gitaly::Repository fields | Jacob Vosmaer | 2017-04-07 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track ↵ | Paweł Chojnacki | 2017-04-07 | 4 | -0/+205 |
| | | | | | | | | | | | | | | | | | | | | | | | | application readiness |