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-06-09Revert "Create the specified remote directory during backup"revert-b826c9ffStan Hu
This reverts commit b826c9ff17b701344028832d523522a3cb925a23
2016-06-09Merge branch '18333-layout-bug' into 'master' Jacob Schatz
Use container helper instead of hard coded container ## What does this MR do? Add `container_class` helper class to fix layout bug ## What are the relevant issue numbers? #18333 ## Screenshots (if relevant) Fixed: ![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png) Fluid: ![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png) See merge request !4543
2016-06-08Merge branch 'dropdown-link-lineheight' into 'master' Jacob Schatz
Fixed dropdown link line-height ## What does this MR do? Fixes line-height issue on dropdown menu links ## Why was this MR needed? The line-height of some dropdown links were taking the parent, most noticeable the commit header ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-08_at_12.26.13](/uploads/51d6bbb4d727da0e3f27d715d6556d4f/Screen_Shot_2016-06-08_at_12.26.13.png) After: ![Screen_Shot_2016-06-08_at_12.25.03](/uploads/2dcbfaa67982500eef42cfe4247cd54d/Screen_Shot_2016-06-08_at_12.25.03.png) See merge request !4531
2016-06-08Merge branch 'dz-improve-ui-consistency' into 'master' Jacob Schatz
Improve ui consistency * Decline idea of using gray buttons actively in UI * remove icons from some buttons that already has text * standardizes margin between buttons First step in https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 See merge request !4533
2016-06-08Merge branch '14098-customize-after-sign-up-path' into 'master' Robert Speicher
Allow custom text on 'almost there' page Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Closes #14098. See merge request !4098
2016-06-08Merge branch '13840-allow-clones-from-http-url-s-without-appending-git' into ↵Robert Speicher
'master' Allow clones from /namespace/project Allow `git clone https://host/namespace/project` to work, in addition to `git clone https://host/namespace/project.git` Closes #13840. See merge request !4530
2016-06-08Allow clones from /namespace/projectSean McGivern
Redirect /namespace/project/info/refs to /namespace/project.git/info/refs, so `git clone` works on either namespace/project.git or namespace/project.
2016-06-08Merge branch 'password-min-length-placeholder' into 'master' Robert Speicher
Added minimum password length to password field Add a placeholder to the password field in the register form with the minimum number of characters required. Also added a pattern to the field to stop it submitting if less than that. Closes #17765 See merge request !4458
2016-06-08Merge branch 'issue_14553' into 'master' Robert Speicher
Set target="_blank" for external links Closes #14553 See merge request !4526
2016-06-08Use container helper instead of hard coded containerAnnabel Dunstone
2016-06-08Merge branch 'rubocop/disable-uniq-before-pluck-cop' into 'master' Robert Speicher
Disable Rails/UniqBeforePluck rubocop cop Rails/UniqBeforePluck seems to have some bugs * https://github.com/bbatsov/rubocop/issues/3122 * https://github.com/bbatsov/rubocop/issues/3148 and we had some problems in EE with that https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/425#note_12245005 See merge request !4477
2016-06-08Fix version references in 8.8 to 8.9 update guideRobert Speicher
[ci skip]
2016-06-08Allow custom text on 'almost there' pageSean McGivern
Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Tweak the styles for that page so that centered lists look reasonable.
2016-06-08Update CHANGELOGAlfredo Sumaran
2016-06-08Combine tests for internal linksAlfredo Sumaran
2016-06-08Remove obvious comment and extra lineAlfredo Sumaran
2016-06-08Set target="_blank" for external linksAlfredo Sumaran
2016-06-08Merge branch 'admin-nav' into 'master' Jacob Schatz
Sidebar updates ## What does this MR do? Updates `nav/_admin.html.haml` and `nav/_explore.html.haml` to match new compact sidebar design ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_2.19.18_PM](/uploads/5699987001de901a67d503b097d1b19d/Screen_Shot_2016-06-07_at_2.19.18_PM.png) See merge request !4517
2016-06-08Merge branch 'knapsack-update-results-only-on-master' into 'master' Kamil Trzciński
Update Knapsack report only on master ## What does this MR do? Makes to generate Knapsack report only on master. This speed-ups tests, because the last stage can be run significant time after previous stages. See merge request !4540
2016-06-08Merge branch '17960-issues-api-endpoint-performs-poorly' into 'master' Yorick Peterse
Optimize issuable APIs interaction with notes See merge request !4471
2016-06-08Merge branch 'improve-notification-settings-migrations' into 'master' Rémy Coutable
Remove notification settings in batches ## What does this MR do? This improves the performance of the migration `db/migrate/20160603180330_remove_duplicated_notification_settings.rb` by removing duplicate rows in batches instead of using a single big `DELETE FROM` query. ## Why was this MR needed? The original migration would locally take 45 minutes to complete, possibly up to hours on GitLab.com and similar setups. ## What are the relevant issue numbers? #18289 See merge request !4529
2016-06-08Update CHANGELOGAlejandro Rodríguez
2016-06-08Merge branch 'remove-labels-from-filter' into 'master' Jacob Schatz
Removable labels from filtered issuables label bar When filtering by labels, a remove button appears next to each label. This then removes that label & refreshes the issuable filter form ![Screen_Shot_2016-05-17_at_12.07.47](/uploads/b21e86247aa1bbfd347bef1eb21f1562/Screen_Shot_2016-05-17_at_12.07.47.png) Closes #15474 See merge request !4178
2016-06-08Merge branch 'webhooks-shared-form' into 'master' Jacob Schatz
Backported from EE shared form for web hooks ## What does this MR do? EE uses a shared form for web hooks - so this brings that across to CE. See merge request !4457
2016-06-08Remove unnecessary icons from buttonsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08Update Knapsack report only on masterKamil Trzcinski
2016-06-08Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez
This was not a clear cut n+1 query, given that if you're directly subscribed to all issues that the API is returning you never really need to check for the notes. However, if you're subscribed to _all_ of them, then for each issuable you need to go once to `notes`, and once to `users` (for the authors). By preemtively loading notes and authors, at worst you have 1 extra query, and at best you saved 2n extra queries. We also took advantage of this preloading of notes when counting user notes.
2016-06-08Remove `projects` inclusion in `notes_with_associations` to skip some ↵Alejandro Rodríguez
unnecessary queries `notes_with_associations` are used for `participant` declarations, but `Participable` only really cares about the target entity project, and not the participants projects. `notes_with_associations` are also used in `Commit::has_been_reverted?` which employs the reference extractor of the commit, so no references to the notes projects are made there (`Mentionable::all_references` cares only about the `author` and other `attr_mentionable`). A paralel situation occurs on `Issue::referenced_merge_requests`.
2016-06-08Remove notification settings in batchesYorick Peterse
This improves performance of the duplicate notification settings migration by removing duplicates in batches instead of using one big "DELETE FROM" query. The previous query would locally run over 45 minutes without even finishing. This new setup finished in a matter of seconds. Fixes #18289
2016-06-08Cleanup and imrpove issue/mr buttonsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08Merge branch 'support-fog-azure' into 'master' Rémy Coutable
Add fog-azure to supported backup list !4396 left out Azure by accident. See merge request !4444
2016-06-08Reject idea of using white/gray button depends on bg colorDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08Merge branch 'git-http-controller' into 'master' Rémy Coutable
Dismantling Grack::Auth part 1: Git HTTP clients Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/14501 This does not completely get rid of Grack::Auth yet because Git LFS support is 'behind' it and I would like to not make this MR bigger than needed. - changed tests to make HTTP requests instead of calling Rack apps - added missing test cases for Git HTTP authentication - moved Git HTTP requests into a 'normal' Rails controller See merge request !3361
2016-06-08Merge branch 'fix-endless-redirect' into 'master' Rémy Coutable
Fix endless redirections when accessing user OAuth applications when they are disabled ## What does this MR do? This MR fixes a bug where the browser would be redirect endlessly when attempting to access the user's OAuth applications when an admin has disabled this system-wide setting. ## Are there points in the code the reviewer needs to double check? I assume disabling the nav button is better than showing a page that says, "OAuth applications are disabled by the admin." ## Why was this MR needed? Lots of users were confused when they hit endless redirect errors. ## What are the relevant issue numbers? #14770 See merge request !4525
2016-06-08Improve button color for issue and mr pagesDmitriy Zaporozhets
* make sidebar button white * make header button gray if not primary Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08Merge branch 'fix-markdown-spec' into 'master' Stan Hu
Fix markdown_spec to not use `before(:all)` in order to properly cleanup database after testing See merge request !4515
2016-06-08Use hex value instead of rgba for gray border colorDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08Fix endless redirections when accessing user OAuth applications when they ↵Stan Hu
are disabled Also hides the "Applications" nav button if OAuth applications are disabled by the admin. Closes #14770
2016-06-08Merge branch 'test-for-ci_authorized_runners' into 'master' Douwe Maan
Add a test for User#ci_authorized_runners ## What does this MR do? Add a test for User#ci_authorized_runners ## Are there points in the code the reviewer needs to double check? Should we add `Project#add_user` so that it's similar to `Group#add_user`? ## Why was this MR needed? I am going to make some changes to this method for !4093, but I couldn't find a corresponding test so I want to add it in case I would break anything. ## What are the relevant issue numbers? This is a test for current behaviour, before implementing #3407 See merge request !4404
2016-06-08Merge branch 'gh-disable-webhooks' into 'master' Douwe Maan
Check if GitHub rate limite API was reached before update Webhooks ## What does this MR do? Checks if the job needs to sleep, and wait for the rate limit to be reseted before update each Webhook. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? The import process can fail if the API rate limit was reached during the import process. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/17498 ## Screenshots (if relevant) Not relevant. See merge request !4509
2016-06-08Merge branch 'knapsack-env-ci' into 'master' Kamil Trzciński
Enable Knapsack only in CI environment Fixes running tests locally. Enables Knapsack only in CI environment. cc @grzesiek See merge request !4528
2016-06-08Fixed dropdown line-heightPhil Hughes
Most noticable on the commit header
2016-06-08Fixed issue with dropdown toggle not updatingPhil Hughes
Added tests
2016-06-08Darken the border between remove label and label namePhil Hughes
2016-06-08Updated designPhil Hughes
2016-06-08Removable labels from filtered issuables label barPhil Hughes
When filtering by labels, a remove button appears next to each label. This then removes that label & refreshes the issuable filter form Closes #15474
2016-06-08Enable Knapsack only in CI environmentKamil Trzcinski
2016-06-08Add parenthesesJacob Vosmaer
2016-06-08Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer
git-http-controller Conflicts: lib/gitlab/workhorse.rb
2016-06-08Merge branch '18080-project-header-alignment' into 'master' Jacob Schatz
Add flexbox to project header ## What does this MR do? Adds flexbox to project header to keep components vertically centered regardless of description presence/length ## What are the relevant issue numbers? Closes #18080 ## Screenshots (if relevant) ![Screen_Shot_2016-06-01_at_12.02.42_PM](/uploads/edd769110b52ec34046f4079619e45eb/Screen_Shot_2016-06-01_at_12.02.42_PM.png) ![Screen_Shot_2016-06-01_at_12.02.35_PM](/uploads/c5c2828ba5688a2588d3721a2d21d5fe/Screen_Shot_2016-06-01_at_12.02.35_PM.png) See merge request !4417