summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Profile requests when a header is passedfeature/profile-requests-conditionallyAhmad Sherif2016-07-265-1/+57
|
* Show release notes in tag listSean McGivern2016-07-261-1/+2
| | | | | | | | 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.
* Merge branch '20156-rescue-reference-create-due-to-file-lock-exists' into ↵Stan Hu2016-07-261-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' 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
| * Rescue Rugged::OSError (lock exists) when creating references.20156-rescue-reference-create-due-to-file-lock-existsPaco Guzman2016-07-261-0/+3
| |
* | Merge branch '20139-branch-icon' into 'master' Fatih Acet2016-07-261-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add branch or tag icon to ref in builds page20139-branch-iconAnnabel Dunstone2016-07-221-0/+2
| | |
* | | Merge branch '20241-expand-all-button-breaks-diff-comparison-view' into ↵Rémy Coutable2016-07-261-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' 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
| * | | Fix expand all diffs button in compare view20241-expand-all-button-breaks-diff-comparison-viewSean McGivern2016-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'multiple-trigger-variables-show-in-separate-line' into 'master' Rémy Coutable2016-07-261-2/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Multiple trigger variables show in separate lineKatarzyna Kobierska2016-07-261-2/+3
| | |/ | |/|
* | | Ensure current user can retry a build before showing the 'Retry' buttonRémy Coutable2016-07-261-1/+1
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Ensure relative paths for video are rewritten as we do for images20189-markdown-video-doesn-t-work-when-the-referenced-video-file-is-in-same-repoRémy Coutable2016-07-262-2/+6
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch ↵Douwe Maan2016-07-251-1/+1
|\ \ | | | | | | | | | 'khaiql/gitlab-ce-fix/missleading-uri-for-labels-in-merge-requests-and-issues-view'
| * | remove search_id for label dropdown filterScott Le2016-07-241-1/+1
| | |
* | | Fix CI status icon link underlineClement Ho2016-07-251-0/+5
| | |
* | | Merge branch 'ie-dropdown-search-field' into 'master' Fatih Acet2016-07-251-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed dropdown search field height in ie11 ## What does this MR do? Fixes the height of the search input in dropdown menus. ## What are the relevant issue numbers? Closes #19684 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_11.49.52](/uploads/fc25bc3d2c3bbd195f30d1953dc12662/Screen_Shot_2016-07-11_at_11.49.52.png) See merge request !5179
| * | | Fixed dropdown search field height in ie11ie-dropdown-search-fieldPhil Hughes2016-07-111-0/+1
| | | | | | | | | | | | | | | | Closes #19684
* | | | Merge branch 'diff-email-css' into 'master' Fatih Acet2016-07-251-61/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced diff email CSS ## What does this MR do? Reduces the amount of inline CSS on the diff emails. ## What are the relevant issue numbers? #15178 See merge request !5203
| * | | | Changed tr to be direct descendantdiff-email-cssPhil Hughes2016-07-211-1/+1
| | | | |
| * | | | Fixed padding on line contentPhil Hughes2016-07-201-6/+4
| | | | |
| * | | | Changed CSS for emails to be mostly single class selectorsPhil Hughes2016-07-131-26/+15
| | | | |
| * | | | Reduced diff email CSSPhil Hughes2016-07-121-48/+19
| | | | |
* | | | | Merge branch 'new-branch-button-highlight' into 'master' Fatih Acet2016-07-252-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add green outline to New Branch button ## What does this MR do? Add green outline to New Branch button on issue page. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? The button was not very visible. ## What are the relevant issue numbers? fixes #18928 ## Screenshots ### Before ![before](/uploads/3bc890e249ef4c3852605a6350c05b9a/before.png) ### After ![after](/uploads/bc627902ffa7c7b4ab20ee7a269fa44f/after.png) See merge request !5447
| * | | | | Add green outline to New Branch button (!5447)winniehell2016-07-232-1/+10
| | | | | |
* | | | | | Merge branch 'use-project-id-in-repo-cache' into 'master' Yorick Peterse2016-07-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use project ID in repository cache to prevent stale data from persisting across projects See merge request !5460
| * | | | | | Use project ID in repository cache to prevent stale data from persisting ↵Stan Hu2016-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | across projects We have a number of bugs caused by cache keys not being flushed properly during deletion of a project. Add the project ID to ensure this never happens. Closes #20027
* | | | | | | Merge branch 'filter-branch-by-name' into 'master' Douwe Maan2016-07-255-10/+57
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can filter branches by name on project branches page This MR aims to solve #18674 by adding the possibility to filter project branches by name ![Screen_Shot_2016-07-07_at_17.21.25](/uploads/b674765d2b1cb8a121c2101715a4568b/Screen_Shot_2016-07-07_at_17.21.25.png) See merge request !5144
| * | | | | | Merge branch 'master' into filter-branch-by-nametiagonbotelho2016-07-22139-831/+1616
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | refactors the search to enable users to filter and sort branches at thetiagonbotelho2016-07-192-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same time and writes tests accordingly changes schema.db removes duplicate field inside CHANGELOG fix db/schema
| * | | | | | implements branches filter functionality and tests accordinglytiagonbotelho2016-07-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | refactors find_similar_branches method to a one liner
| * | | | | | implements the basic filter functionalitytiagonbotelho2016-07-195-10/+63
| | | | | | |
* | | | | | | Merge branch 'remove-magic-comments' into 'master' Rémy Coutable2016-07-256-9/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove magic comments from Ruby files ## What does this MR do? Remove magic comments (`# encoding: UTF-8`) from Ruby files. ## Why was this MR needed? Since Ruby 2, UTF-8 is the default encoding and those comments are no longer necessary. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5163#note_13134307 cc @rymai See merge request !5456
| * | | | | | | Remove magic comments from Ruby files (!5456)winniehell2016-07-246-9/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fork-counter-link' into 'master' Rémy Coutable2016-07-251-8/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make fork counter always clickable ## What does this MR do? Make the fork counter on project pages clickable for people who forked the project. ## Why was this MR needed? The fork counter was not clickable. ## What are the relevant issue numbers? fixes #20205 See merge request !5463
| * | | | | | | Make fork counter always clickable (!5463)winniehell2016-07-241-8/+4
| | | | | | | |
* | | | | | | | Merge branch 'fix-wiki-error-500' into 'master' Rémy Coutable2016-07-252-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when creating Wiki pages with hyphens or spaces - Closes gitlab-com/support-forum#874 - Closes #20209 See merge request !5444
| * | | | | | | | `WikiPage` should have a slug even when not persisted.fix-wiki-error-500Timothy Andrew2016-07-252-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. So we can build the markdown preview URL for it. 2. We can't skip the slug in this case, because the slug is used to construct relative markdown URLs. 3. Add rspec feature tests to cover creating wiki pages with spaces/hyphens in the name. 4. Add rspec feature tests for markdown preview URL rewriting, which was only covered by unit tests up to this point.
| * | | | | | | | Fix Error 500 when creating Wiki pages with hyphens or spacesStan Hu2016-07-241-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes gitlab-com/support-forum#874
* | | | | | | | ES6ify all the things!Fatih Acet2016-07-24270-10463/+12695
| |/ / / / / / |/| | | | | |
* | | | | | | Revert "Merge branch ↵Alejandro Rodríguez2016-07-245-19/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" This reverts merge request !5375
* | | | | | Merge branch 'nullify-note-type' into 'master' Stan Hu2016-07-231-5/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where replies to commit notes displayed in the MR discussion tab wouldn'… Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20157 See merge request !5446
| * | | | | | Fix bug where replies to commit notes displayed in the MR discussion tab ↵Douwe Maan2016-07-231-5/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | wouldn't show up on the commit page
* | | | | | Merge branch 'add-gitlab-workhorse-version-to-admin-dashboard' into 'master' Douwe Maan2016-07-231-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gitlab-workhorse version to admin dashboard ## What does this MR do? Add gitlab-workhorse version to admin dashboard. ## What are the relevant issue numbers? Closes #15418 ## Screenshot ![Zrzut_ekranu_2016-07-20_o_23.20.55](/uploads/ba6761e2145d903ac87bc7198bc8b182/Zrzut_ekranu_2016-07-20_o_23.20.55.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Add test - show Gitlab Workhorse version on Admin Dashboard - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) cc @ubudzisz @yorickpeterse @grzesiek [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5321
| * | | | | | Add gitlab-workhorse version to admin dashboardKatarzyna Kobierska2016-07-231-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test for showing GitLab Workhorse version on Admin Dashboard Refactoring
* | | | | | Merge branch 'improve-rename-logging' into 'master' Robert Speicher2016-07-231-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project rename log messages for better debugging This should help diagnose issues such as #20178. See merge request !5450
| * | | | | | Improve project rename log messages for better debuggingimprove-rename-loggingStan Hu2016-07-231-1/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | Helping to diagnose #20178
* | | | | | Merge branch 'dz-avatar-border' into 'master' Dmitriy Zaporozhets2016-07-234-15/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add light border to rounded avatars Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20128 To make it clear that avatar is cropped by border radius cc @hazelyang See merge request !5429
| * | | | | Add light border to rounded avatarsdz-avatar-borderDmitriy Zaporozhets2016-07-224-15/+13
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'preserve_repo_ref_param' into 'master' Robert Speicher2016-07-221-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing repo_ref param Closes #19444 See merge request !5435
| * | | | | fix missing repo_ref parambarthc2016-07-221-1/+2
| |/ / / /