- 26 Jul, 2016 40 commits
-
-
Douwe Maan authored
Return request profiling info when a header is passed ## What does this MR do? It allows returning profiling info (instead of actual content) when a certain header is passed ## Why was this MR needed? To facilitate having a performance overview of certain requests. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/infrastructure/issues/211 ## 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~~ - [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 !5281
-
Douwe Maan authored
Fix a bug where forking a project from a repository storage to another would fail ## What does this MR do? Fix a bug where forking a project from a repository storage to another would fail. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? If you have a project in storage_a, change the default storage to storage_b, and attempt to fork said project, the import will fail. ## What are the relevant issue numbers? Closes #20302 - [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 - [ ] All builds are passing - [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) - [ ] Merge https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/75, publish the tag, and update `GITLAB_SHELL_VERSION` See merge request !5509
-
Fatih Acet authored
Remove inline scripts from import pages. ## What does this MR do? Removes inline scripts from the Import Status pages for all the importers we have. ## Are there points in the code the reviewer needs to double check? That this doesn't break anything (it didn't when I tested it!) ## Why was this MR needed? Inline scripts are bad, this removes a few of them. ## What are the relevant issue numbers? #18231 and #19866 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] 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 !5283
-
Fatih Acet authored
Make branches sortable without push permission ## What does this MR do? Make branches on the branches page sortable without push permission. ## Why was this MR needed? Sorting branches (a readonly action) required push permission which does not make sense. ## What are the relevant issue numbers? fixes #18678 ## Screenshots ### Before ![before](/uploads/d77d0be2599481b815cb2ef1f9c33a15/before.png) ### After ![after](/uploads/edbcf9d5ec4b2650866742ead0c2c1ed/after.png) See merge request !5462
-
Douwe Maan authored
-
Alejandro Rodríguez authored
-
Connor Shea authored
Instead add data attributes to a JS hook element on every import status page.
-
winniehell authored
-
Fatih Acet authored
Resolve "Commits graph has overlapping text on mobile" Apply responsive design for labels on Commits and Continuous Integration graphs. ## What does this MR do? Make the labels on Commits and Continuous Integration graphs smaller for mobile devices. ## Are there points in the code the reviewer needs to double check? Graphs should not break at any screen size. ## Why was this MR needed? Labels overlaps each other on mobile devices. ## What are the relevant issue numbers? Fixes #18846 (but also fixes a similar bug on Continuous Integration graph). ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-21_at_23.15.29](/uploads/acbbb8d751a2192595a61804d09868d9/Screen_Shot_2016-06-21_at_23.15.29.png) After: ![Screen_Shot_2016-06-21_at_23.04.57](/uploads/ab7607901c3ae07d2c2d3e25e83de901/Screen_Shot_2016-06-21_at_23.04.57.png) ## 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~~ - [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: @jschatz1 See merge request !4841
-
Ahmad Sherif authored
-
Robert Speicher authored
Upgrade database_cleaner from 1.4.1 to 1.5.3. This includes support for Rails 5 without deprecations warnings. Working toward #14286. Changelog: https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc#153-2016-04-22 See merge request !5505
-
Connor Shea authored
This includes support for Rails 5 without deprecations warnings. Changelog: https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc#153-2016-04-22
-
Rémy Coutable authored
Show release notes in tag list ## What does this MR do? Two things in one! Ensure that a tag's message having an invalid UTF-8 byte sequence doesn't cause a 500, like at: https://gitlab.com/bitcubate/node/tags?page=9 (The problem tag is https://gitlab.com/bitcubate/node/tags/v0.1.0) Also ensure that the release notes are actually shown on the tag index, like they are supposed to. ## Are there points in the code the reviewer needs to double check? There's not much, so all of it. ## Why was this MR needed? The tags index was broken in two ways. ## What are the relevant issue numbers? Closes #20233 but does more than that. ## Screenshots (if relevant) Before: ![image](/uploads/5456fcc70f02794570762e6ed9c6d863/image.png) After: ![image](/uploads/0329bf93e0f1be2417e500e924bc775d/image.png) ## 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 - [ ] 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 !5503
-
Sean McGivern authored
A release's tag reference is just the name of the tag, not the entire tag object. This also fixes the tags index if a tag's message contains non-UTF8 byte sequences.
-
Stan Hu authored
Rescue Rugged::OSError (lock exists) when creating references. ## What does this MR do? Rescue an exception on concurrent scenarios. I was able to create a spec for this, because if you create the lock file before trying to create the reference the reference is created without a problem and the lock file is removed. So IMHO there is a race condition where more than one process is trying to create the same reference at the same time raising the exception, so I just added the patch without specs. ```ruby it "attempting to call keep_around when exists a lock does not fail" do ref = repository.send(:keep_around_ref_name, sample_commit.id) path = File.join(repository.path, ref) lock_path = "#{path}.lock" FileUtils.mkdir_p(path) File.open(lock_path, 'w') { |f| f.write('') } begin # No exception is raised because the lock file is removed at some point in the process repository.keep_around(sample_commit.id) ensure File.delete(path) File.delete(lock_path) end end ``` ## Why was this MR needed? ## What are the relevant issue numbers? Closes #20156 ## 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 - [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 !5497
-
Fatih Acet authored
Add branch or tag icon to ref in builds page ## What does this MR do? Add branch or tag icon to ref in builds page ## Why was this MR needed? It's currently missing but should be there ## What are the relevant issue numbers? Closes #20139 ## Screenshots (if relevant) <img src="/uploads/fb5c9a285a1ce95c0aa8dfa5e32c5d7d/Screen_Shot_2016-07-22_at_9.14.39_AM.png" width="400px"> See merge request !5434
-
Rémy Coutable authored
Fix expand all diffs button in compare view ## What does this MR do? Fix the expand all diffs button in compare view. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? We can't reuse the existing value of the format parameter, because on the merge request page that's 'json', so the link would go to a JSON file. We can't set it to HTML, because that adds '.html' to the URL, which breaks the compare view (and looks bad). Setting it to `nil` uses the default format, which in all of these cases is HTML anyway. ## What are the relevant issue numbers? Closes #20241. See merge request !5500
-
Rémy Coutable authored
Multiple trigger variables show in separate line ## What does this MR do? Separate lines for multiple trigger variables ## Screenshot ![Zrzut_ekranu_2016-07-19_o_13.05.01](/uploads/a6f9ec842f65266ae38922b1e9d5ab84/Zrzut_ekranu_2016-07-19_o_13.05.01.png) ## What are the relevant issue numbers? Closes #19006 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Add tests for multiple trigger variables view - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) cc @ubudzisz @grzesiek @yorickpeterse @tmaczukin [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5357
-
Sean McGivern authored
We can't reuse the existing value of the format parameter, because on the merge request page that's 'json', so the link would go to a JSON file. We can't set it to HTML, because that adds '.html' the URL, which breaks the compare view (and looks bad). Setting it to nil uses the default format, which in all of these cases is HTML anyway.
-
Katarzyna Kobierska authored
-
Rémy Coutable authored
Remove spec/features/projects/branches_spec.rb~HEAD file ## What does this MR do? Remove unnecessary `spec/features/projects/branches_spec.rb~HEAD` file. See merge request !5489
-
Rémy Coutable authored
Ensure current user can retry a build before showing the 'Retry' button ## What does this MR do? Fixes #20150. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] 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 !5476
-
Yorick Peterse authored
Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable See merge request !5054
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Katarzyna Kobierska authored
-
Paco Guzman authored
-
Rémy Coutable authored
Add missing escape at line end Documentation fix, pretty simple. See merge request !5422
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Merge branch '20189-markdown-video-doesn-t-work-when-the-referenced-video-file-is-in-same-repo' into 'master' Ensure relative paths for video are rewritten as we do for images ## What does this MR do? This ensures that path to videos are rewritten as we do for images. ## Are there points in the code the reviewer needs to double check? I've decided to add a new `Blob#video?` method for simplicity's sake but this should probably be added to `Gitlab::Git::Blob`. ## What are the relevant issue numbers? Fixes #20189. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] 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 !5474
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Disable MySQL foreign key checks before dropping all tables Fixes #20237. Disables MySQL foreign key checks before dropping all tables in a restore. MySQL doesn't honor `CASCADE` without a special flag when the database/tables are created. In order to drop the tables we need to disable foreign key checks. After the drop, re-enable the key checks. WIP: Pending confirmation from customer that this fix works. See merge request !5472
-
Douglas Barbosa Alexandre authored
-
Drew Blessing authored
-
Stan Hu authored
-
Stan Hu authored
This significantly reduces the DB churn in the PostReceive task when it performs reference extraction. See #18663
-
Douwe Maan authored
Added '*.js.es6 gitlab-language=javascript' to .gitattributes ## What does this MR do? According to the branch name this adds the `sytanx` highlighting for `.js.es6` files, but this actually adds the `syntax` highlighting.
😆 ## Are there points in the code the reviewer needs to double check? Is this the right place?🏃 ## Why was this MR needed? We need pretty ES6 diffs. ## What are the relevant issue numbers? Flyin' solo🛫 ## Screenshots (if relevant) ## 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 !5486 -
Douwe Maan authored
-