Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-21Merge branch 'artifacts-from-ref-and-build-name-api' into 'master' Rémy Coutable
API for downloading latest successful build ## What does this MR do? Implement parts of #4255, particularly the API. ## Are there points in the code the reviewer needs to double check? I still made it that `ref` could be either branch, tag, or even SHA with: ``` ruby # ref can't be HEAD, can only be branch/tag name or SHA scope :latest_successful_for, ->(ref) do table = quoted_table_name # TODO: Use `where(ref: ref).or(sha: ref)` in Rails 5 where("#{table}.ref = ? OR #{table}.sha = ?", ref, ref). success.order(id: :desc) end ``` Because the reasons I put in: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13165543 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13165921 But if you still think that it's not good to do it this way, I'll drop it and let's think about the other way to satisfy the requirement specified in https://gitlab.com/gitlab-org/gitlab-ce/issues/4255#note_13101233 It could be `status=any` or `sha=DEADBEAF` ## What are the relevant issue numbers? Part of #4255 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [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 - [ ] 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 you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5347
2016-07-21Merge branch 'sidebar-clipboard-toggle' into 'master' Fatih Acet
Prevent toggling sidebar when clipboard icon clicked. Prevents sidebar being toggle when copy to clipboard icon clicked. Fixes #19399 ![sidebar-toggle](/uploads/e4e8dfe9ff2546464269242b5f3e34b1/sidebar-toggle.gif) See merge request !5326
2016-07-21Merge branch 'fix-side-by-side-comment-widget' into 'master' Jacob Schatz
Fix side by side comment widget Fixes comment button for empty lines in side by side diff view. Fixes #19824 Fixes #19957 See merge request !5262
2016-07-21Merge branch 'email-domain-blacklist' into 'master' Robert Speicher
Added the ability to block sign ups using a domain blacklist. As part of this MR, I restructured the Application Settings form to separate **Sign up** related settings from **Sign in** related settings and make everything cleaner and easier to read. Fixes #19749 Related to #5573 See merge request !5259
2016-07-21Merge branch '4142-show-inline-video' into 'master' Rémy Coutable
Add support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff) ## What does this MR do? It adds support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff). Most of the work was done by @hayesr in !3508 but a few improvements were still missing. ## Why was this MR needed? To be able to play uploaded videos in GitLab! ## What are the relevant issue numbers? Closes #4142. ## Screenshots ### Video players ![Screen_Shot_2016-07-19_at_18.44.09](/uploads/e85e531b455a41c3e66b26b356abaafd/Screen_Shot_2016-07-19_at_18.44.09.png) ----- ![Screen_Shot_2016-07-19_at_18.44.29](/uploads/05f52a812760210d1eae86a7f8fc48bc/Screen_Shot_2016-07-19_at_18.44.29.png) ----- ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Test `VideoLinkFilter` - [x] Test in `spec/features/markdown_spec.rb` - [x] Improve `spec/uploaders/file_uploader_spec.rb` - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5215
2016-07-21Merge branch 'add-link-to-commit-avatar' into 'master' Rémy Coutable
Add link to profile to commit avatar ## What does this MR do? - links to user profiles to the avatars on commits page - tooltips to the avatars on commits page side effect: - links to user profiles to the avatars on pipelines page - tooltips to the avatars on pipelines page - tooltips to the avatars on activity page - mailto links to the avatars on activity page for non-registered users ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? There were no links nor Zeldas. ## What are the relevant issue numbers? fixes #19644 See merge request !5163
2016-07-21Merge branch 'issue_8110' into 'master' Rémy Coutable
Allow slack service to send messages on different channels closes #8110 ## Allow slack service to send messages on different channels ![new_slack_service](/uploads/87de0bd6b02a4f7853358676b5e74dff/new_slack_service.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5124
2016-07-20Merge branch '15343-build-settiings' into 'master' Rémy Coutable
Resolve "Move Build badges settings to Builds page (or Builds settings)" ## What does this MR do? Removes pipeline settings section from project settings & creates a new pipelines settings page Adds builds badge to pipelines settings page & removes badge page ## Are there points in the code the reviewer needs to double check? All Rails updates -> particularly `builds_controller.rb` and `routes` Spacing needs to be updated across all settings pages and will be in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/issues/19827) ## What are the relevant issue numbers? Closes #15343 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-19_at_5.47.29_AM](/uploads/48e6d203de4cbe0b697280128695d980/Screen_Shot_2016-07-19_at_5.47.29_AM.png) ![Screen_Shot_2016-07-14_at_9.25.13_AM](/uploads/59118440f3e7bb903f44260abb119376/Screen_Shot_2016-07-14_at_9.25.13_AM.png) See merge request !5244
2016-07-20Merge branch 'issue-19641' into 'master' Jacob Schatz
Fix Issue 19641 (new snippets style bug) ## What does this MR do? Fixes Issue 19641 (new snippets style bug) ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Requested in issue 19641 by Fatih Acet https://gitlab.com/gitlab-org/gitlab-ce/issues/19641 ## What are the relevant issue numbers? 19641 ## Screenshots (if relevant) ![Screenshot_2016-07-09_13.25.39](/uploads/8ead7ea8f4aae7ccaa4d2ddc495b6fe3/Screenshot_2016-07-09_13.25.39.png) ## Does this MR meet the acceptance criteria? Yes - [ x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ NA] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ NA] API support added - Tests - [NA ] Added for this feature/bug - [ X] All builds are passing - [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 you do - rebase it please) - [ x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5170
2016-07-20Merge branch 'issue_18585' into 'master' Rémy Coutable
Allow to disable user request access to groups/projects fixes #18585 ![projects](/uploads/9f381e77ffbcd2ecdbabdb8b201b95e4/projects.png) ![namespaces](/uploads/4b8d39c80576b499118373f0a221882c/namespaces.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [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 - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5286
2016-07-20Merge branch 'regression/cron_jobs_validation' into 'master' Rémy Coutable
Log cron_jobs configuration instead of raising exception ## What does this MR do? Log cron_jobs configuration errors and remove invalid key <-> values from the configuration hash instead of raising an exception. This has been discussed at #20010. Fixes #20010 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Original implementation !5318, introduced a regression with our docker packaging: #20010. ## What are the relevant issue numbers? * #20010 * #18378 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5360
2016-07-20Merge branch 'fix/import_data-migration' into 'master' Rémy Coutable
Fix migration corrupting import data for old version upgrades Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19073 Not a fan of changing old migrations but this will prevent issues from upgrading GitLab version 8.6 or older to 8.10 More details of the issue on https://gitlab.com/gitlab-org/gitlab-ce/issues/19073#note_13190450 See merge request !5358
2016-07-20Merge branch 'wiki-gfm-autocomplete' into 'master' Jacob Schatz
Fixed GFM autocomplete not loading on wiki pages ## What does this MR do? Allows the GFM autocomplete to work on wiki pages. ## What are the relevant issue numbers? Closes #19580 See merge request !5132
2016-07-20Merge branch 'rename-repo-files' into 'master' Douwe Maan
Implements the form for renaming the new filename on the file edit page ## What does this MR do? Adds the possibility to edit a filename when editing the content of a file on Gitlab this MR was made to solve #5850 ![Screen_Shot_2016-07-01_at_16.45.53](/uploads/eeed05800e3dc11f1e3840e0e4fa06b5/Screen_Shot_2016-07-01_at_16.45.53.png) See merge request !5049
2016-07-20Merge branch 'ci-predefined-variables' into 'master' Rémy Coutable
Add predefined CI variables to GitLab ## What does this MR do? This adds predefined CI variables to GitLab for container registry, pipelines, project name, etc. It also makes sure that all currently documented variables are send from GitLab. This is added to follow up on this proposal: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/185#note_11844286. To migrate almost all variables out of Runner to GitLab to simplify adding a new of variables without the need for changing the GitLab Runner. ## Why was this MR needed? Our CI variables miss a lot of crucial information that should be easily accessible. This tries to fill this gap. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/185, https://gitlab.com/gitlab-org/gitlab-ce/issues/18164, https://gitlab.com/gitlab-org/gitlab-ce/issues/18075. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4826
2016-07-20Merge branch 'external-wiki-helper-speedup' into 'master' Yorick Peterse
speed up ExternalWikiService#get_project_wiki_path ## What does this MR do? Speed up ExternalWikiHelper#get_project_wiki_path ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? See issue #19886 ## What are the relevant issue numbers? #19886 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5305
2016-07-19Merge branch 'allow-deploy-key-to-download-public-projects' into 'master' Rémy Coutable
Allow to pull code with deploy key from public projects ## What does this MR do? With deploy keys you can download any public projects stored in GitLab. ## What are the relevant issue numbers? Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/1217 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5316
2016-07-19Merge branch 'note-form-login-link-referer' into 'master' Fatih Acet
Added redirect_to_referer to login link on issues ## What does this MR do? Adds a `redirect_to_referer` param to login & register links on issues when not logged in. This makes the login box redirect back to the issue after login. ## What are the relevant issue numbers? Closes #19968 See merge request !5344
2016-07-19Merge branch 'deployment-tracking' into 'master' Rémy Coutable
Added Rake task for tracking deployments ## What does this MR do? This MR adds a Rake task to track the current version of GitLab in InfluxDB. ## Are there points in the code the reviewer needs to double check? We may want to document this Rake task in some Markdown file, but I'm not sure what the best place for this would be. ## Why was this MR needed? We want to have a more accurate overview of when deployments occurred. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/infrastructure/issues/98 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] ~~API support added~~ - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5320
2016-07-19Merge branch 'manual-actions' into 'master' Rémy Coutable
Add support for manual CI actions ## What does this MR do? This implements a `when: manual` which allows a jobs to be marked as manual actions. Manual actions have to be explicitly executed by developers. ## What are the relevant issue numbers? This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010 See merge request !5297
2016-07-19Merge branch 'fix/import-export-project-avatar' into 'master' Rémy Coutable
Project avatar import/export functionality Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19851 Adds logic to export and import a project avatar - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5273
2016-07-19Merge branch 'bug/sidekiq-cron-better-error' into 'master' Gabriel Mazetto
Improve cron_jobs loading error messages ## What does this MR do? Improves the error message from "Sidekiq Cron Jobs" plugin, when trying to load a incorrect definition from gitlab config files. This is the output before the fix: ``` 2016-06-08T16:43:19.277Z 2890 TID-gso49ojro INFO: Booting Sidekiq 4.1.2 with redis options {:url=>"unix:/var/run/redis/redis.sock", :namespace=>"resque:gitlab"} undefined method `delete' for nil:NilClass /home/git/gitlab/config/initializers/sidekiq.rb:16:in `block (2 levels) in <top (required)>' /home/git/gitlab/config/initializers/sidekiq.rb:16:in `each' /home/git/gitlab/config/initializers/sidekiq.rb:16:in `block in <top (required)>' /home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/sidekiq-4.1.2/lib/sidekiq.rb:70:in `configure_server' ``` This is the output after the fix: ``` 2016-07-18T10:53:22.414Z 66332 TID-oxal1bmik INFO: Booting Sidekiq 4.1.4 with redis options {:url=>"redis://localhost:6378", :namespace=>"resque:gitlab"} Invalid cron_jobs config key: 'registry'. Check your gitlab config file. /home/git/gitlab/config/initializers/sidekiq.rb:21:in `block (2 levels) in <top (required)>' /home/git/gitlab/config/initializers/sidekiq.rb:17:in `each' /home/git/gitlab/config/initializers/sidekiq.rb:17:in `block in <top (required)>' /home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/ruby-2.1.8/gems/sidekiq-4.1.4/lib/sidekiq.rb:70:in `configure_server' ``` Fixes #18378 ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Original error doesn't give any hint on where the problem can be, so the user can't easily troubleshoot unless he knows implementation details. ## What are the relevant issue numbers? #18378 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5318
2016-07-19Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into ↵Yorick Peterse
'master' Don't parse Rinku returned value to DocFragment when didn't change original html string. See merge request !5311
2016-07-19Merge branch 'undo-revert-of-4892' into 'master' Rémy Coutable
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'"" ## What does this MR do? Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564. ## What are the relevant issue numbers? Closes #19872. See merge request !5310
2016-07-19Merge branch '19820-safer-diffs' into 'master' Douwe Maan
Collapsed diffs lines/size don't accumulate to overflow diffs. ## What does this MR do? Reduce the number of lines that we highlight on big diffs to try to reduce the degradation introduced by !4990 as you can see on the issue description #19820 . We collapse any files after the diff is over the number of safe files (100), or over the safe lines (500) or over the safe number of bytes (5KB x 100 files). We still need to bump the gitlab_git and point this branch to the new gitlab_git version. ## What are the relevant issue numbers? Closes #19820 Closes #19885 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5306
2016-07-19Merge branch 'master' into 'master' Jacob Schatz
Fix activity heatmap to show proper day name. ## What does this MR do? This MR fixes issue #19909. ## Are there points in the code the reviewer needs to double check? Not necessarily, it's pretty straightforward, buuuut There was some discussion about whether GL wanted the activity heatmap to start on Monday or Sunday, this fix makes it start on Sunday, if GL is wanting it to start on Monday then some more substantial changes need to be made on the `calendar.js.coffee` script. ## Why was this MR needed? The amount of day names that were off from their dates was too damn high! :P ## What are the relevant issue numbers? Directly #19909 Also some related discussion (feature discussion): #19282, #5988 ## Screenshots (if relevant) **Currently on GL.com** ![Screen_Shot_2016-07-16_at_10.56.02_PM](/uploads/b45cfc56c29a8865a2bdc1f798409706/Screen_Shot_2016-07-16_at_10.56.02_PM.png) **After MR** ![Screen_Shot_2016-07-16_at_10.56.30_PM](/uploads/d8655bb259ced443a2c572ff03dcb8bb/Screen_Shot_2016-07-16_at_10.56.30_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5303
2016-07-19Merge branch 'cs-gemojione-3' into 'master' Robert Speicher
Upgrade gemojione to 3.0.0 Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12 [Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) :tada: This update has new emoji and more sensical categories. See merge request !5237
2016-07-19Merge branch 'issue_13343' into 'master' Robert Speicher
Allow build email service to be tested Fixes #13343 See merge request !5223
2016-07-19Merge branch 'api-dev-can-push' into 'master' Rémy Coutable
API: Expose 'developers_can_push' for branches ## What does this MR do? Adds support for the `developers_can_push` flag for the branches API. It also supports creating protected branches with that flag. ## Are there points in the code the reviewer needs to double check? The API call requires an optional boolean parameter `developers_can_push`. If it is not either `true` or `false`, it should not update the value. I'm not sure if this is the right way to do it. Right now it always returns `200`. Maybe the `PUT` method should return different status codes depending if it really created or updated a branch. ## What are the relevant issue numbers? Closes #12735 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5208
2016-07-19Merge branch 'fix/import-export-encoding' into 'master' James Lopez
Fix MR diff encoding issues exporting projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19338 See merge request !5039
2016-07-18Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable
Store when and yaml variables in builds table ## What does this MR do? Stores `when` and `yaml_variables` in `ci_builds` table. ## Why was this MR needed? This is done in order to simplify the code responsible for creating a pipeline builds. ## What are the relevant issue numbers? This made as a pre-step for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5295. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5296
2016-07-18Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable
Make docker registry work with location redirects when external storage is used ## What does this MR do? Honor `Location:` header when working with local registry. Location makes it possible to download manifests from external storage. ## What are the relevant issue numbers? Fixed https://gitlab.com/gitlab-org/gitlab-ce/issues/18477 ## Remark Adding `FollowRedirects` makes that we leak `Authorization:` in followed requests. That is why it is implemented manually and we are explicitly removing `Authorization` header. cc @marin @twk3 See merge request !4677
2016-07-18Merge branch 'pending-tab' into 'master' Rémy Coutable
Add Pending Tab to Builds ## What does this MR do? Add Pending Tab to Builds and separate "running" and "pending" jobs in UI. ## Why was this MR needed? Increase visibility to "pending" . ## What are the relevant issue numbers? Closes #19408 ## Screenshots Before: ![Zrzut_ekranu_2016-07-05_o_11.52.48](/uploads/01dc1f3664f5aacb2ec09d52d19c521e/Zrzut_ekranu_2016-07-05_o_11.52.48.png) After: ![Zrzut_ekranu_2016-07-05_o_11.51.34](/uploads/f3be02427996fecf50c65dd51ce1b9fb/Zrzut_ekranu_2016-07-05_o_11.51.34.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin @zj [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5084
2016-07-18added changelogJames Lopez
2016-07-18Merge branch 'api-isssues-due-date' into 'master' Rémy Coutable
API: Expose due_date for issues ## What does this MR do? Add support for the `due_date` of issues to the API. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18696 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5212
2016-07-18Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski
store-variables-and-when-in-builds-table # Conflicts: # db/schema.rb
2016-07-18Merge branch 'track-pipeline-user' into 'master' Rémy Coutable
Track a user who creates a Pipeline ## What does this MR do? This adds additional column to pipelines to track user who is creating pipelines. ## Why was this MR needed? This is to make it possible to show all pipelines created by specific user and to later solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/18054 ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18992 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5272
2016-07-18Merge branch 'fix-deployment-creation-on-build-retry' into 'master' Rémy Coutable
Fix creation of deployment on build that is retried, redeployed or rollback ## What does this MR do? Add missing `environment` to be copied when retrying a build. ## Why was this MR needed? The retried builds did not create a deployments. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19521 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5275
2016-07-18Add tests to project builds for pending tabKatarzyna Kobierska
Fix CHANGELOG Fix build spec for pending tab
2016-07-18Add Pending Tab to Admin BuildsKatarzyna Kobierska
Add Pending Tab to Project Builds Update CHANGELOG
2016-07-18Merge branch 'allow-to-pull-public-images' into 'master' Rémy Coutable
Allow to access Container Registry for Public and Internal projects ## What does this MR do? Adds missing ability `read_container_image` for `public scope` which affects users accessing public and internal projects. ## Why was this MR needed? Previously, we allowed to use container registry for anonymous users, but did not allow to do the same for logged in. This MR makes it possible. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18176 https://gitlab.com/gitlab-org/gitlab-ce/issues/19668 https://gitlab.com/gitlab-org/gitlab-ce/issues/19117 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5279
2016-07-18Merge branch 'fix-stage-status-show-for-pipelines' into 'master' Rémy Coutable
Fix stage status shown for pipelines ## What does this MR do? Properly calculates a status of stage when shown on a list of pipelines ## Why was this MR needed? Previously we were calculating a status for all builds, including retried ones. This were affecting a overall stage status when a build were retried. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18896 https://gitlab.com/gitlab-org/gitlab-ce/issues/18150 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5277
2016-07-18Merge branch 'fix/import-export-retry-settings' into 'master' Rémy Coutable
Limit number of project export retries to 3 I think 3 should be a sufficient number of retries - at the moment we were doing 20+ This will only send a maximum of 3 emails if the project export went wrong. Tested - project import is not affected. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18966 See merge request !5267
2016-07-18Merge branch 'fix-lfs-ci-fetch' into 'master' Rémy Coutable
Fix LFS CI fetch ## What does this MR do? Fixes LFS fetching for CI objects that were kind of broken. ## Why was this MR needed? This also refactors LFS tests to be a blackbox tests instead of whitebox tests. Actually testing GrackAuth instead of LFSRouter. ## Related isssues Resolves: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1199 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5270
2016-07-18Merge branch 'normalize_emoji_aliases_paths' into 'master' Rémy Coutable
Fix not normalized emoji paths ## What does this MR do? It normalizes emoji names in `api` and `toggle_award` ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? User was able to store +1 and thumbsup to databse, causing UI inconsistency. ## What are the relevant issue numbers? Fixes #19104 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5060
2016-07-18added changelogJames Lopez
2016-07-16Store when and yaml variables in builds tableKamil Trzcinski
2016-07-16Fix creation of deployment on build that is retried, redeployed or rollbackKamil Trzcinski
2016-07-16Merge branch 'mentioned-user-tooltip' into 'master' Douwe Maan
Display tooltip for mentioned users and groups ## What does this MR do? Display tooltip for mentioned users and groups in Markdown. ## Are there points in the code the reviewer needs to double check? I don't know. ## Why was this MR needed? No tooltips were displayed. ## What are the relevant issue numbers? fixes #17060 ## Screenshots ![user-tooltip](/uploads/501b7d1b2a5e6adcadefbc56b08422ec/user-tooltip.png) ![group-tooltip](/uploads/0152a452f9a1ed9fc86101b242f7e4c2/group-tooltip.png) See merge request !5261
2016-07-15Merge branch '17341-firefox-u2f' into 'master' Robert Speicher
Allow U2F devices to be used in Firefox - Adds U2F support for Firefox - Improve U2F feature detection logic - Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`) - Closes #17341 - Related to #15337 See merge request !5177