- 14 Dec, 2016 19 commits
-
-
Grzegorz Bizon authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Dimitrie Hoekstra authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
Remove empty line
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Grzegorz Bizon authored
* master: (151 commits) Improve build status specs contexts descriptions Add some missing tests for detailed status methods Fix wrong error message expectation in API::Commits spec Remove trailing blank line from Allowable module Move admin settings spinach feature to rspec Encode when migrating ProcessCommitWorker jobs Prevent overflow with vertical scroll when we have space to show content Make rubocop happy API: Ability to cherry-pick a commit Be smarter when finding a sudoed user in API::Helpers Update manual build icon SVG Make it possible to mix `Gitlab::Routing` in Backport hooks on group policies for the EE-specific implementation Extract abilities checking module from ability model Extend tests for pipeline detailed status helpers Add tests for common build detailed status helpers Add missing tests for build `cancelable?` method Add tests for detailed build statuses factory Make it possible to retry build that was canceled Make build retryable only if complete and executed ... Conflicts: app/assets/stylesheets/pages/pipelines.scss app/models/ci/build.rb app/models/ci/pipeline.rb app/models/ci/stage.rb app/models/commit_status.rb app/views/admin/runners/show.html.haml app/views/projects/builds/_header.html.haml app/views/projects/ci/builds/_build.html.haml app/views/projects/ci/builds/_build_pipeline.html.haml app/views/projects/ci/pipelines/_pipeline.html.haml app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml app/views/projects/pipelines/_info.html.haml lib/gitlab/ci/status/build/common.rb lib/gitlab/ci/status/build/play.rb lib/gitlab/ci/status/build/stop.rb lib/gitlab/ci/status/core.rb spec/lib/gitlab/ci/status/pipeline/common_spec.rb
-
Rémy Coutable authored
Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png) ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989
-
Rémy Coutable authored
Fix wrong error message expectation in API::Commits spec See commit message or https://gitlab.com/gitlab-org/gitlab-ce/issues/25651#note_19996076 for the explanation. Closes #25651 See merge request !8083
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Encode when migrating ProcessCommitWorker jobs ## What does this MR do? This adds encoding logic to the migration for ProcessCommitWorker, ensuring it doesn't throw errors when the input can not be converted to UTF-8 without extra help. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/25489 See merge request !8064
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
Fix broken link for latest deployment ## What does this MR do? Creates a new helper for the latest deployment link. ## Why was this MR needed? A helper that returns a link was being called inside another helper that creates a link, resulting in `builds/<a href="builds/ID>#id</a>` ## What are the relevant issue numbers? Closes #25136 See merge request !7839
-
Rémy Coutable authored
This was because the MR was a bit behind master and the error message got updated in the meantime by 79aad815. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Grzegorz Bizon authored
-
- 13 Dec, 2016 21 commits
-
-
Annabel Dunstone Gray authored
Prevent overflow with vertical scroll when we have space to show content ## What does this MR do? Removes vertical and horizontal scroll from builds, environments and pipelines tables by adding a media query since this is only necessary in smaller screens. ## Screenshots (if relevant) ![scroll](/uploads/6b9e3584df6e4ca29553d2ff576b794e/scroll.jpg) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #20052 See merge request !8061
-
Rémy Coutable authored
Backport hooks on group policies for the EE-specific implementation See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/822#note_19955431 See merge request !8066
-
Rémy Coutable authored
Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API? Closes #25450 See merge request !8047
-
Rémy Coutable authored
For single line Git commit messages, the close quote should be on the same line as the open quote _Originally opened at !7299 by @jzinn._ - - - ## What does this MR do? Chomps merge commit messages so that there is not a dangling close quote. A better solution would be not to use quotes at all, but to set off the message in a `<div>` with a background color. ## Screenshots (if relevant) ![Screen_Shot_2016-11-04_at_8.06.54_PM](/uploads/6e749c5227d88a9bfea64e70cccaf14a/Screen_Shot_2016-11-04_at_8.06.54_PM.png) See merge request !7975
-
Sean McGivern authored
API: Memoize the current_user so that the sudo can work properly Closes #25482 See merge request !8017
-
Rémy Coutable authored
Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 Part of #23036 See merge request !8058
-
Rémy Coutable authored
API: Ability to get group's project in simple representation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25412 See merge request !8060
-
jurre authored
-
Yorick Peterse authored
If the source encoding is not UTF-8 we need to encode the data as `JSON.dump` may throw an error if the input can not be converted to UTF-8. We only encode when necessary to reduce the overhead. Fixes gitlab-org/gitlab-ce#25489
-
Filipa Lacerda authored
Adds changelog
-
Robert Schilling authored
-
Robert Schilling authored
-
Dmitriy Zaporozhets authored
Add index to routes table on lower path for postgresql Improve performance of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121 See merge request !8041
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Douglas Barbosa Alexandre authored
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Allow all alphanumeric characters in file names ## What does this MR do? Allow more characters in file names such as Chinese symbols. ## Why was this MR needed? It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor. ## What are the relevant issue numbers? fixes #20190 See merge request !8002
-