- 01 12月, 2016 25 次提交
-
-
由 Jacob Vosmaer 提交于
-
由 Rémy Coutable 提交于
Improve the `Gitlab::OAuth::User` error message ## What does this MR do? Fixes a logging issue submitted by a customer at https://gitlab.zendesk.com/agent/tickets/50728. The error saving the user is logged to application.log. Previously, the entry had no context and was unusable - `Error saving user: [Email address already taken]`. Adding the auth hash UID and email makes the error more helpful. For such a small logging change, do we need a changelog entry? See merge request !7851
-
由 Robert Speicher 提交于
Refactor branch chooser in issuable form Continuation of #23864. Sister of gitlab-org/gitlab-ee!930. See merge request !7852
-
由 Douwe Maan 提交于
23718/backup rake task human readable ## What does this MR do? Add the human readable format to the backup tar file. From `1477317140_gitlab_backup.tar` to `1477317140_2016_10_24_gitlab_backup.tar`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? #23718 issue ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] 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? 23718 See merge request !7188
-
由 Robert Speicher 提交于
Merge branch '22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install' into 'master' New `gitlab:workhorse:install` rake task ## Why was this MR needed? Because with this we can remove the "Ensure the gitlab-workhorse version in Install gitlab-workhorse matches the required version." step from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1! MR is ready: gitlab-org/release-tools!57 Closes #22719 See merge request !6574
-
由 Sean McGivern 提交于
Fixes access to the wiki code with git when repository feature disabled ## What does this MR do? Allow access to the wiki repository with git when the repository feature is disabled. ## Why was this MR needed? Without this fix, if you create a wiki only project you are not allowed to download the wiki code from this project. ## Does this MR meet the acceptance criteria? - [X] [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 - [X] Added for this feature/bug - [ ] 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) - [ ] 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? Fixes #24931 See merge request !7832
-
由 Fatih Acet 提交于
Resolve "External statuses not shown correctly on pipeline page" ## What does this MR do? Updates `generic_commit_status/_generic_commit_status.html.haml` template to match the changes made to `ci/builds/_build.html.haml` which had not previously been carried over. ## Testing 1. Ensure updated fixtures are installed (from !7792) so that these changes are made apparent. (check out the !7792 branch if not yet merged into master, then `bundle exec rake db:drop` and `bundle exec rake dev:setup`) 2. Visit a build list page or an individual pipeline page which contains an external build status. 3. The results should look like this: ### Before: ![Screen_Shot_2016-11-28_at_9.11.27_PM](/uploads/ed8c5beb857cd17147dbddf8f5ecab1d/Screen_Shot_2016-11-28_at_9.11.27_PM.png) ### After: ![Screen_Shot_2016-11-28_at_9.12.05_PM](/uploads/9f953a5f14764e336afa4481a917947f/Screen_Shot_2016-11-28_at_9.12.05_PM.png) ## Are there points in the code the reviewer needs to double check? Look for any places where these partials may be rendered to ensure external status match regular build statuses. ## Why was this MR needed? The generic commit status template has been largely overlooked when changes are made to build table rows which should be duplicated in both places. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - Tests - [x] ~~Added for this feature/bug~~ - [ ] 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 #24710 See merge request !7811
-
由 Fatih Acet 提交于
Fixed GFM autocomplete regex ## What does this MR do? Their was a bug in the regex that meant it was matching from the beginning of the GFM input text. This fixes that by splitting spaces & then checking on the last match. It also fixes a bug where `@#` etc. would open 2 autocomplete dropdowns. ## What are the relevant issue numbers? Closes #25119 See merge request !7826
-
由 Achilleas Pipinellis 提交于
Refactor the Git submodules with CI docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22567 See merge request !7856
-
由 Fatih Acet 提交于
Resolve "Change font of commit list in a system note according to proposed design" ## What does this MR do? This MR closes #25092 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? To improve `UX` ## Screenshots (if relevant) **Before** ![before](/uploads/50b72a1f818c5a5dc633b06eee3eff92/before.png) **After** ![after](/uploads/7a488fe22a942af8846fcd202da8f400/after.png) ## 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25092 See merge request !7822
-
由 Achilleas Pipinellis 提交于
[ci skip]
-
由 Fatih Acet 提交于
Fix appearance in error pages ## What does this MR do? The error pages under `app/views/errors/*` looks like the error page for 404 `public/404.html` ## Are there points in the code the reviewer needs to double check? I restructured how the GitLab logo is shown in the `public/404.html` and all the pages under `app/views/errors/*`. ## Why was this MR needed? #24363 ## Screenshots (if relevant) Before ![Screen_Shot_2016-11-10_at_11.11.48](/uploads/b134195dd2d63d093ec0a6d906761e3f/Screen_Shot_2016-11-10_at_11.11.48.png) After ![Selection_064](/uploads/d57601513d6ab3c0b5e1c7448ecf6ffc/Selection_064.png)![Selection_057](/uploads/50220320bad0b1c14ec8d1e89e490373/Selection_057.png)![Selection_060](/uploads/1e04e4ce36ef7fa5bee4e7916b0e5de2/Selection_060.png)![Selection_059](/uploads/0a4a02a8bae132232d4331adce132d4a/Selection_059.png)![Selection_062](/uploads/3d96f0e8c0e5f0f73b3b51cbb168c76a/Selection_062.png)![Selection_061](/uploads/e127a2b2acc810a9176d02927f1c8dbc/Selection_061.png)![Selection_063](/uploads/e3f682c293539ff195a78018da872abf/Selection_063.png) ## Does this MR meet the acceptance criteria? - [X] [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 - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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? See merge request !7635
-
由 Annabel Dunstone Gray 提交于
25044 Make md header tabs match nav tabs ## What does this MR do? Changes styling of md-header tabs to match navigation tabs ## Screenshots (if relevant) ## 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 - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25044 See merge request !7801
-
由 Annabel Dunstone Gray 提交于
new system note design for commit discussion ## What does this MR do? This MR implement new system notes design for discussion on a commit. ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? It improves UX and coherent style in UI ## Screenshots (if relevant) **before** ![commit-discussion-before](/uploads/b68ab7cce583a18ac066691448f955e7/commit-discussion-before.png) **After** ![commit-discussion-after](/uploads/e9c0cb48c29fdd9b6de6f23a3c588d03/commit-discussion-after.png) ## Does this MR meet the acceptance criteria? - [x] [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24894 See merge request !7721
-
由 Fatih Acet 提交于
Resolve "Environments displaying incorrect date since 8.14 upgrade" ## What does this MR do? Shows the correct date in the environments table. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Date shown was not the correct one. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] Added for this feature/bug - [ ] 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 #24844 See merge request !7830
-
-
-
-
-
由 Rémy Coutable 提交于
API: Expose branch status Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938 See merge request !7796
-
由 Rémy Coutable 提交于
Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Drew Blessing 提交于
The error saving the user is logged to application.log. Previously, the entry had no context and was unusable - 'Error saving user: [Email address already taken]'. Adding the auth hash UID and email makes the error more helpful.
-
由 Stan Hu 提交于
Revert bump in rufus-scheduler Somehow `bundle install` with an update to Sidekiq-cron in !7815 caused rufus-scheduler to be bumped, when it doesn't appear absolutely necessary. Closes #25160 See merge request !7844
-
由 Sean McGivern 提交于
Disable the `ee_compat_check` task on dev See merge request !7847
-
由 Sean McGivern 提交于
Make the `downtime_check` task happy See merge request !7845
-
- 30 11月, 2016 15 次提交
-
-
由 Rémy Coutable 提交于
We usually use it for security fixes that don't need to be ported to EE and the task seems to hang when run against the security branch. Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Rémy Coutable 提交于
Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Stan Hu 提交于
Somehow `bundle install` with an update to Sidekiq-cron caused rufus-scheduler to be bumped, when it doesn't appear absolutely necessary. Closes #25160
-
由 Rémy Coutable 提交于
Grapify the files API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7806
-
由 Filipa Lacerda 提交于
-
由 Filipa Lacerda 提交于
-
由 Filipa Lacerda 提交于
Adds test Adds changelog entry
-
由 Robert Schilling 提交于
-
由 Robert Schilling 提交于
-
由 Rémy Coutable 提交于
Grapify the projects API Related to #22928 See merge request !7456
-
由 Rémy Coutable 提交于
Do not raise error in AutocompleteController#users when not authorized Closes #25031 See merge request !7817
-
由 Rémy Coutable 提交于
Speed up Group security access specs This is the Group equivalent of 13ad9a74 See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See merge request !7813
-
由 Rémy Coutable 提交于
Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Kamil Trzciński 提交于
Create pipeline along with builds in the transation ## What does this MR do? This MR makes it possible to create pipeline along with all associated builds in the transaction, to avoid having empty pipelines when asynchronous job gets terminated. This will simplify implementation of `PipelineUnlockWorker` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6988 and improve reliability of the CI as a whole. ## What are the relevant issue numbers? Related to #24361 See merge request !7742
-
由 Kamil Trzciński 提交于
Rename `MergeRequest#pipeline` to `head_pipeline` ## What does this MR do? This MR renames `MergeRequest#pipeline` to `MergeRequest#head_pipeline` ## Does this MR meet the acceptance criteria? - [x] All builds are passing ## What are the relevant issue numbers? Closes #24810 See merge request !7783
-