summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Retrieve rendered HTML from cache in one requestfix/get-cached-rendered-html-using-single-redis-requestAhmad Sherif2016-07-213-20/+30
| | | | See #19985
* Merge branch 'discussion-model' into 'master' Robert Speicher2016-07-2127-1096/+340
|\ | | | | | | | | | | | | Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
| * Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-2027-1096/+340
| |
* | Merge branch 'ui-bug-fixes' into 'master' Robert Speicher2016-07-219-12/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI bug fixes Closes #20074 Closes #20094 Regression UI bug fixes * Fix broken status icon on project page * Center tooltip on empty state in pipeline * Reduce max-width of commit title in pipeline so more fits in table * Fixes firefox rendering (icons getting cut off) * Fixes Safari rendering of SHA icon See merge request !5383
| * | Fix sha icon positioning on safariui-bug-fixesAnnabel Dunstone2016-07-211-2/+2
| | |
| * | Mobile view for commit statusAnnabel Dunstone2016-07-212-1/+10
| | |
| * | Fix ci icons getting cut offAnnabel Dunstone2016-07-215-9/+9
| | |
| * | Fix firefox rendering of SVGsAnnabel Dunstone2016-07-211-0/+1
| | |
| * | Fix icons on commits page and builds pageAnnabel Dunstone2016-07-212-1/+9
| | |
| * | Add new fork SVG to fix weird styling of other SVGsAnnabel Dunstone2016-07-211-1/+3
| | |
| * | Bug fixesAnnabel Dunstone2016-07-213-5/+19
| | |
* | | Merge branch 'bump-vmstat-version' into 'master' Stan Hu2016-07-212-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump vmstat version to fix issues reporting on FreeBSD Minor changes from 2.1.0 to 2.1.1: https://github.com/threez/ruby-vmstat/commits/master See merge request !5405
| * | | Bump vmstat version to fix issues reporting on FreeBSDStan Hu2016-07-212-3/+3
| | | |
* | | | Merge branch 'fix-has-external-wiki-migration' into 'master' Rémy Coutable2016-07-211-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't drop in DropAndReaddHasExternalWikiInProjects ## What does this MR do? This MR fixes the migration in question so it doesn't first drop and then re-add a column. ## Are there points in the code the reviewer needs to double check? Not really. ## Why was this MR needed? The old migration could lead to application errors as the column would temporarily not exist between the drop column and add column statements. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/infrastructure/issues/239 ## 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] 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 !5402
| * | | | Don't drop in DropAndReaddHasExternalWikiInProjectsfix-has-external-wiki-migrationYorick Peterse2016-07-211-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Dropping a column and then re-adding it can lead to the application throwing errors as the column may temporarily not exist. To work around this we'll reset the various project rows in batches _without_ removing any columns.
* | | | Merge branch 'document-allow_failure-keyword' into 'master' Achilleas Pipinellis2016-07-211-23/+58
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add allow_failure CI documentation ## What does this MR do? Adds documentation for the `allow_failure` keyword for the CI. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17669 See merge request !5398
| * | | Add allow_failure CI documentationdocument-allow_failure-keywordAchilleas Pipinellis2016-07-211-23/+58
| | | |
* | | | Merge branch '20079-new-wiki-page-500' into 'master' Stan Hu2016-07-211-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Don't use `params[:id]` while building `markdown_preview_path`. - Closes #20079 See merge request !5400
| * | | Don't use `params[:id]` while building `markdown_preview_path`.20079-new-wiki-page-500Timothy Andrew2016-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Instead, use `@page.title`, since it's always guaranteed to be around in a wiki. 2. `params[:id]` is _not_ always guaranteed to be around - if a page is created with errors, `render :edit` is called, and `params[:id]` is `nil`. 3. More context: https://gitlab.com/gitlab-org/gitlab-ce/issues/20079#note_13223240
* | | | Merge branch 'fix-migration-introduced-by-5387' into 'master' Stan Hu2016-07-212-13/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migration to make it fast ## What does this MR do? Changing the migration introduced in !5387 so that it's fast. The idea is that the content of the `projects.has_external_wiki` is currently wrong, so we can just drop and recreate the column. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG needed - Tests - [ ] 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 !5394
| * | | Fix migration to make it fastRémy Coutable2016-07-212-13/+14
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Fix CHANGELOGRémy Coutable2016-07-211-34/+35
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '20055-build-duration-showing-too-many-digits' into 'master' Stan Hu2016-07-212-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cast duration to integer in `TimeHelper#time_interval_in_words` Fixes #20055. - [x] No CHANGELOG since it fixes a regression introduced in RC12. - 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 !5391
| * | | Cast duration to integer in `TimeHelper#time_interval_in_words`Rémy Coutable2016-07-212-0/+2
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '20061-emailsonpushworker-fails-on-new-branch-pushes' into ↵Rémy Coutable2016-07-212-2/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix emails on push for new and deleted branches ## What does this MR do? Fix EmailsOnPushWorker when the push is either a new branch or a deleted branch. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? / What are the relevant issue numbers? Closes #20061. ## Does this MR meet the acceptance criteria? - ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ (regression) - ~~[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 !5390
| * | Fix emails on push for new and deleted branches20061-emailsonpushworker-fails-on-new-branch-pushesSean McGivern2016-07-212-2/+38
| | |
* | | Merge branch 'fix/new-project-import-tooltip' into 'master' Fatih Acet2016-07-213-12/+28
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show tooltip on GitLab export link in new project page Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19993 When the project path/name is not filled, we should show a tooltip in the `GitLab export` link, plus a flash message if the user still tries to click on it. - [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) - [ ] 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 !5363
| * | fix spec - unused varfix/new-project-import-tooltipJames Lopez2016-07-201-1/+1
| | |
| * | fix specJames Lopez2016-07-201-1/+3
| | |
| * | added spec, fixed wordingJames Lopez2016-07-202-3/+16
| | |
| * | added changelogJames Lopez2016-07-201-0/+1
| | |
| * | fix JS - now tooltip and flash should showJames Lopez2016-07-201-9/+9
| | |
* | | Merge branch 'hide-project-name-in-project-activities' into 'master' Fatih Acet2016-07-218-20/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide project name in project activities ## What does this MR do? - hide namespace and project name on project activity page ## Are there points in the code the reviewer needs to double check? - did `.event_label` have any meaning? ## Why was this MR needed? - all events on project activity page are from the same project, so the information was redundant ## What are the relevant issue numbers? closes #18963 ## Screenshots ### Before ![events-before](/uploads/76336e3f5cb08d4ef984df73c89aa90f/events-before.png) ### After ![events-after](/uploads/4a10718ed32960efc115d7854e5cad68/events-after.png) ![after-john-activity](/uploads/d9d151a829d8d32136525e8eb7ea04ad/after-john-activity.png) See merge request !5068
| * | | Hide namespace and project name on project activity page (!5068)winniehell2016-07-148-20/+27
| | | |
* | | | Merge branch 'add-preview-image-border' into 'master' Fatih Acet2016-07-214-29/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add image border in Markdown preview ## What does this MR do? - add image border in Markdown preview like it is show after a comment is saved - fix margin and shade of `<hr>` in Markdown preview ## Are there points in the code the reviewer needs to double check? Is `.md` the right class to use? ## Why was this MR needed? The border was missing. ## What are the relevant issue numbers? fixes #19652 ## Screenshots ### Before ![before](/uploads/683e2af7278c33d29b2a1ae19d1136e3/before.png) ### After ![after](/uploads/07dcee531a5696303cb34b4a88357e8a/after.png) See merge request !5162
| * | | | Add image border in Markdown preview (!5162)winniehell2016-07-214-29/+24
| | | | |
* | | | | Merge branch 'gl-dropdown-enter-key-fix' into 'master' Fatih Acet2016-07-212-1/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed dropdown enter key when searching ## What does this MR do? When searching in a dropdown you can now just press the enter key to trigger a click on the first row rather than having to press the down key & then enter. ## What are the relevant issue numbers? Closes #19741 See merge request !5231
| * | | | | Fixed issue where using arrow keys would require arrow key to be pressed twicegl-dropdown-enter-key-fixPhil Hughes2016-07-201-5/+2
| | | | | |
| * | | | | Highlights first row when filtering in dropdownsPhil Hughes2016-07-201-0/+11
| | | | | |
| * | | | | Fixed dropdown enter key when searchingPhil Hughes2016-07-202-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Closes #19741
* | | | | | Merge branch 'doc-award-emoji' into 'master' Rémy Coutable2016-07-211-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doc for award emoji API ## What does this MR do? It fixes some docs for the award emoji API. ## Are there points in the code the reviewer needs to double check? @zj I'm assigning you since you wrote this docs. ## Does this MR meet the acceptance criteria? ~~- [ ] [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~~ ~~- [ ] 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 !5386
| * | | | | | Update doc for award emoji APIRobert Schilling2016-07-211-2/+2
| | | | | | |
* | | | | | | Merge branch '20067-wiki-not-visible-from-web' into 'master' Rémy Coutable2016-07-214-29/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Service.external_wikis return only active external wikis Fixes #20067. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since it fixes a RC12 regression - 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 !5387
| * | | | | | | Make Service.external_wikis return only active external wikisRémy Coutable2016-07-214-29/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch ↵Rémy Coutable2016-07-212-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '20041-gitlab-workhorse-version-should-be-update-to-0-7-8-in-our-documentation' into 'master' Update gitlab-workhorse version to 0.7.8 in installation and update guides Closes #20041. See merge request !5385
| * | | | | | | | Update gitlab-workhorse version to 0.7.8 in installation and update guidesRémy Coutable2016-07-212-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'artifacts-from-ref-and-build-name-api' into 'master' Rémy Coutable2016-07-219-43/+258
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Merge branch 'master' into artifacts-from-ref-and-build-name-apiLin Jen-Shin2016-07-21150-649/+2182
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (261 commits) Add link to user profile to commit avatar (!5163) Refactor service settings view Fix a problem with processing a pipeline where stage only has manual actions A CHANGELOG entry Don't show other actions of the same name Use limit parameter rather than hardcoded value Remove icons from explore nav Change how we style redirect_to Use flash[:notice] only Create PipelinesSettingsController for showing settings page Fix a few nitpicks Allow to disable user request access to groups/projects Enable Style/MultilineTernaryOperator rubocop cop Fix review comments Update routes Update CHANGELOG Improve implementation of variables Log cron_jobs configuration instead of raising exception Added checks for migration downtime Ensure to_json methods take optional argument ...
| * | | | | | | | Workaround MySQL with INNER JOIN:Lin Jen-Shin2016-07-212-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' Oh well.
| * | | | | | | | Just put setup directly in the test, feedback:Lin Jen-Shin2016-07-211-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13202462