summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'increase_artifact_size_column' into 'master' Yorick Peterse2016-09-163-2/+18
|\ | | | | | | | | Increase ci_builds artifacts_size column to 8-byte integer to allow larger files See merge request !6333
| * Increase ci_builds artifacts_size column to 8-byte integer to allow larger filesDrew Blessing2016-09-153-2/+18
| |
* | Merge branch 'integer_migration_style' into 'master' Yorick Peterse2016-09-163-43/+88
|\ \ | | | | | | | | | | | | Integer migration style See merge request !6334
| * | fixDrew Blessing2016-09-151-8/+3
| | |
| * | Add support for column limits in add_column_with_defaultDrew Blessing2016-09-153-44/+94
| |/
* | Merge branch 'sh-add-link-to-reliable-capybara-specs' into 'master' Achilleas Pipinellis2016-09-161-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Add link to article on how to write reliable, asynchronous tests with Capybara This article has been incredibly useful for all developers. Adding a link to it so more people can refer to it. See merge request !6312
| * | Add link to article on how to write reliable, asynchronous tests with Capybarash-add-link-to-reliable-capybara-specsStan Hu2016-09-121-0/+2
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'diff-comments-toggle-tooltip-hide' into 'master' Fatih Acet2016-09-162-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides tooltip on discussion toggle button when clicking ## What does this MR do? Hides the tooltip when clicking the discussion toggle button. Rather than triggering the tooltip to hide we trigger blur. This is because of how _amazing_ Bootstraps tooltips are. They are shown also on focus so if we trigger the tooltip to hide & then mouseover the button again the tooltip still shows. ## What are the relevant issue numbers? Closes #20750 See merge request !6303
| * | | Hides tooltip on discussion toggle button when clickingdiff-comments-toggle-tooltip-hidePhil Hughes2016-09-122-0/+2
| | | | | | | | | | | | | | | | Closes #20750
* | | | Merge branch 'issue-boards-large-height-load' into 'master' Fatih Acet2016-09-162-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards loading issues on large screens ## What does this MR do? On larger screens it is possible for 20 issues to load (this is the amount per page) & there still to be room underneath the last issue which means the list can't scroll stopping the infinite scrolling working. This MR checks if there are more issues to load, if there are & the height of the scroll area is less than or the same as scroll height then more issues are loaded. This will keep happening until it is possible to scroll, once it is possible to scroll it goes back to the default behaviour of the infinite scrolling. ## What are the relevant issue numbers? Closes #22092 See merge request !6319
| * | | | Fixed issue boards loading issues on large screensissue-boards-large-height-loadPhil Hughes2016-09-132-0/+6
| | | | | | | | | | | | | | | | | | | | Closes #22092
* | | | | Merge branch 'issue_21824' into 'master' Fatih Acet2016-09-163-9/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issuable templates dropdown for forked projects fixes #21824 See merge request !6329
| * | | | | Fix issuable templates dropdown for forked projectsissue_21824Felipe Artur2016-09-153-9/+14
| | | | | |
* | | | | | Merge branch 'group-specific-lfs-settings' into 'master' Rémy Coutable2016-09-1621-19/+288
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added group-specific setting for LFS. Groups can enable/disable LFS, but this setting can be overridden at the project level. **Admin only** Closes #18092 See merge request !6164
| * | | | | | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-1511-26/+137
| | | | | | |
| * | | | | | Correct helper for group LFS status.Patricio Cano2016-09-151-14/+14
| | | | | | |
| * | | | | | Improved helper methods, better flow for `project.lfs_enabled?`, and UI fixes.Patricio Cano2016-09-157-37/+33
| | | | | | |
| * | | | | | Added CHANGELOG itemPatricio Cano2016-09-151-0/+2
| | | | | | |
| * | | | | | Added group-specific setting for LFS.Patricio Cano2016-09-1519-12/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Groups can enable/disable LFS, but this setting can be overridden at the project level. Admin only
* | | | | | | Merge branch 'rs-update-rubocop-rspec' into 'master' Rémy Coutable2016-09-163-14/+71
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rubocop-rspec to 1.7.0 See merge request !6357
| * | | | | | | Update `.rubocop.yml` for rubocop-rspec 1.7.0rs-update-rubocop-rspecRobert Speicher2016-09-151-10/+67
| | | | | | | |
| * | | | | | | Bump rubocop-rspec to 1.7.0Robert Speicher2016-09-152-4/+4
| |/ / / / / /
* | | | | | | Merge branch 'fix-typos' into 'master' Rémy Coutable2016-09-162-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling: sucessfully -> successfully Originally from gitlab-org/gitlab-ee!682 See merge request !6376
| * | | | | | | Fix spelling: sucessfully -> successfullyStan Hu2016-09-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally from gitlab-org/gitlab-ee!682
* | | | | | | | Merge branch '20870-secret-variables-sorted-by-key' into 'master' Rémy Coutable2016-09-162-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort secret keys by key instead of id. Closes #20870 See merge request !6275
| * | | | | | | | Sort secret variables by key (fix #20870)Diego Souza2016-09-092-3/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/irreversible-migration' into 'master' Rémy Coutable2016-09-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined method when reverting migration `RemoveProjectsPushesSinceGc` See merge request !6375
| * | | | | | | | | Fix undefined method when reverting migration RemoveProjectsPushesSinceGcfix/irreversible-migrationDouglas Barbosa Alexandre2016-09-151-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ci-stages' into 'master' Fatih Acet2016-09-163-15/+30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI stages #### What does this MR do? Removes individual columns for each stage, consolidating them into one `Stages` column #### Screenshots (if relevant) ![Screen_Shot_2016-09-14_at_12.32.41_PM](/uploads/24f8d817481ba8f711c127bf143649ba/Screen_Shot_2016-09-14_at_12.32.41_PM.png) #### What are the relevant issue numbers? Closes #21925 See merge request !6338
| * | | | | | | | Change percentage to pxAnnabel Dunstone Gray2016-09-161-1/+1
| | | | | | | | |
| * | | | | | | | Update stages to match sketch fileci-stagesAnnabel Dunstone Gray2016-09-161-5/+7
| | | | | | | | |
| * | | | | | | | Remove empty stage state; fit tooltip on one lineAnnabel Dunstone Gray2016-09-164-26/+7
| | | | | | | | |
| * | | | | | | | Remove centering of stagesAnnabel Dunstone Gray2016-09-161-1/+0
| | | | | | | | |
| * | | | | | | | Remove stage names; connect stages in columnAnnabel Dunstone Gray2016-09-164-15/+48
|/ / / / / / / /
* | | | | | | | Merge branch 'issue-boards-keyboard-shortcut' into 'master' Jacob Schatz2016-09-157-22/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added keyboard shortcut to navigate to issue boards ## What does this MR do? Adds a keyboard shortcut of `g l` to navigate to issue boards. `g b` would work nicer. However that is taken by builds. Open to suggestions. ## What are the relevant issue numbers? Closes #21218 See merge request !6248
| * | | | | | | | Fixed testsissue-boards-keyboard-shortcutPhil Hughes2016-09-153-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added wait for vue helper
| * | | | | | | | Added keyboard shortcut to navigate to issue boardsPhil Hughes2016-09-155-0/+34
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #21218
* | | | | | | | Merge branch '18849-project-snippets-page-isn-t-really-responsive' into ↵Jacob Schatz2016-09-1516-92/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update snippets UI ## What does this MR do? Updates snippets UI _(mainly mobile view)_ to new UI proposed in #18849. ## Are there points in the code the reviewer needs to double check? Does anyone know the implementation difference between `app/views/snippets/show.html.haml` and `app/views/projects/snippets/show.html.haml`? I have only been updating the latter as it's the only one I can find implemented. I assume the former is rendered somewhere seeing as there is controllers for it too. But this doesn't seem very DRY from my current perspective. ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-09-06_at_14.20.10](/uploads/ac124a3b0896872ce851b9f56fbe339c/Screen_Shot_2016-09-06_at_14.20.10.png) ![Screen_Shot_2016-09-06_at_14.20.32](/uploads/8d3c7b1d1a5f562ceb6dc22bde695289/Screen_Shot_2016-09-06_at_14.20.32.png) ![Screen_Shot_2016-09-06_at_14.20.48](/uploads/6b1c31ece6d2400bbfc3c673d9e82d4b/Screen_Shot_2016-09-06_at_14.20.48.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 - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) ## What are the relevant issue numbers? Closes #18849 See merge request !6210
| * | | | | | | | Reordered dropdown options18849-project-snippets-page-isn-t-really-responsiveLuke Bennett2016-09-0716-92/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearranged datetime created line Added `avatar_class` option to `link_to_member` so it can be hidden Made snippet title font heavier Added file title bar Hidden unneeded info from xs screens Added visibility icon Reveal file-actions on xs screens Added comments icon to snippets list items Refactored no-comments declaration into framework stylesheet Final touch ups Fixed snippets_spec
* | | | | | | | | Merge branch 'ee-919-backport-changes' into 'master' Jacob Schatz2016-09-151-11/+9
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore gl_dropdown.js changes Restores `fieldName` to allow only string values. `fieldName` was changed to accept function as a value in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/581 Since the approach changed in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687 there's no need to accept function as value. Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687 EE Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/919 See merge request !6234
| * | | | | | | | fieldName can’t be a functionee-919-backport-changesAlfredo Sumaran2016-09-061-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore changes introduced in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/581
| * | | | | | | | Ensure we update dropdown label after selecting an optionAlfredo Sumaran2016-09-061-6/+7
| | | | | | | | |
* | | | | | | | | Merge branch '22203-reduce-duplication-in-commits-cherry_pick_service' into ↵Robert Speicher2016-09-153-27/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Reduce duplication in `Commits::{CherryPickService,RevertService}` ## What does this MR do? This factorize similar code from `Commits::{CherryPickService,RevertService}`. ## Why was this MR needed? To get rid of flay offense. ## What are the relevant issue numbers? Closes #22203 See merge request !6366
| * | | | | | | | Reduce duplication in Commits::{CherryPickService,RevertService}22203-reduce-duplication-in-commits-cherry_pick_serviceRémy Coutable2016-09-153-27/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'rs-fix-todos-filtering-spec' into 'master' Rémy Coutable2016-09-151-4/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve validity of spec/features/todos/todos_filtering_spec.rb Previously, we were checking that a CSS selector string didn't have some page-related content, which, of course it didn't. Now we check against the actual content of the selector, we use a more semantic selector, and we add an additional expectation for the text that _should_ be there, as an additional sanity check. See merge request !6356
| * | | | | | | | | Improve validity of spec/features/todos/todos_filtering_spec.rbrs-fix-todos-filtering-specRobert Speicher2016-09-141-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we were checking that a CSS selector string didn't have some page-related content, which, of course it didn't. Now we check against the actual content of the selector, we use a more semantic selector, and we add an additional expectation for the text that _should_ be there, as an additional sanity check.
* | | | | | | | | | Merge branch 'fix-old-migration-repos-path-key' into 'master' Robert Speicher2016-09-152-5/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update references to deprecated `repos_path` configuration key to avoid ## What does this MR do? Update references to deprecated `repos_path` configuration key to avoid errors when updating GitLab from older versions ## Why was this MR needed? Users were reporting errors when upgrading from GitLab 6.7 ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1464 See merge request !6350
| * | | | | | | | | | Update references to deprecated `repos_path` configuration key to avoidfix-old-migration-repos-path-keyAlejandro Rodríguez2016-09-142-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | errors on updates from older versions
* | | | | | | | | | | Merge branch 'group-similar' into 'master' Rémy Coutable2016-09-1510-35/+213
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group similar builds We group builds by removing from the builds name two numbers which are delimited by whitespace or colon: * `name 0 1` => `name` * `name 0:1` => `name` * `name 0/1` => `name` * `name 0:1 ruby` => `name ruby` * `name 0/1 ruby` => `name ruby` * `0 1 name ruby` => `name ruby` * `0:1 name ruby` => `name ruby` * `0/1 name ruby` => `name ruby` See merge request !6242
| * | | | | | | | | | | Fix spec failuresgroup-similarKamil Trzcinski2016-09-145-13/+10
| | | | | | | | | | | |