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-10-15Fix Spinach failure due overprecise percentage matchingStan Hu
The percentages in the language match changed by a tenth of a percentage point for Ruby and JavaScript, which led to this failure. Partial fix to #23378
2016-10-14Merge branch 'cs-really-fix-spinach'Kamil Trzcinski
2016-10-14Try to fix re-runKamil Trzcinski
2016-10-14Remove spinach retry.Connor Shea
2016-10-14Merge branch 'issue-23306-fix' into 'master' Dmitriy Zaporozhets
Add missing routes to make group edits work 6b90ccb9fd changed the routes so that users/groups can be accessed via`/:id`, but the Rails `form_for` method expects to use the `groups#show` path helper for the form action URL. This causes group edits and deletes to fail because the PUT/PATCH/DELETE methods did not exist for `/:id`. This MR adds these methods so that `form_for` continues to work. Closes #23306 See merge request !6874
2016-10-14Merge branch 'members-ui' into 'master' Fatih Acet
Project members UI ## What does this MR do? New UI for project members that includes groups. ## Screenshots (if relevant) ### Project members ![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png) ### Group members ![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png) ## What are the relevant issue numbers? Part of #19868 Closes #21320 See merge request !6148
2016-10-14Move edit group scenario to rspec and refactor groups_specDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-06Add tag shortcut from the Commit pageAkram FARES
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-06Merge branch 'master' into members-uiPhil Hughes
2016-10-06MergeRequest new form load diff asynchronouslyPaco Guzman
2016-10-06Merge commit 'dev/security' into 'master'Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-04Merge branch 'master' into members-uiPhil Hughes
2016-10-04Merge branch 'master' into revert-c676283bPhil Hughes
2016-10-03Merge branch 'fix/import-export-admin' into 'master' Robert Speicher
Enable Import/Export for non-admin users Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315 Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !6080
2016-10-03Convert "SSH Keys" Spinach features to RSpecRobert Speicher
2016-10-03Enable import/export back for non-adminsJames Lopez
2016-10-03Merge branch 'master' into revert-c676283bPhil Hughes
2016-09-27Enforce the fork_project permission in Projects::CreateServiceNick Thomas
Projects::ForkService delegates to this service almost entirely, but needed one small change so it would propagate create errors correctly. CreateService#execute needs significant refactoring; it is now right at the complexity limit set by Rubocop. I avoided doing so in this commit to keep the diff as small as possible. Several tests depend on the insecure behaviour of ForkService, so fi them up at the same time.
2016-09-27Add organization field to user profileDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-27Merge branch 'full-width-new-snippet-button' into 'master' Fatih Acet
Added full-width new snippet button on mobile and corrected capitalization ## What does this MR do? Adds full-width `New snippet` button to snippet mobile views and corrects `New Snippet` to `New snippet` throughout. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? @connorshea Spotted that I missed this in !6210 :) ## Screenshots (if relevant) ![Screen_Shot_2016-09-16_at_10.40.21](/uploads/ddca2da3a5ef787298bfc87e129db820/Screen_Shot_2016-09-16_at_10.40.21.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? See merge request !6380
2016-09-20fix issues mr counterbarthc
2016-09-18Added full-width new snippet button on mobile and corrected capitalizationLuke Bennett
Altered specs that click capitalised New Snippet button Applied review feedback missed in Changes `.no-comment` `opactiy: 0.5` to `opacity: .5` Added `.btn-wide-on-xs` and applied to snippet buttons
2016-09-13Fixed group testsPhil Hughes
2016-09-13Updated some specsPhil Hughes
Fixed issue with group name not showing
2016-09-13Added import button back inPhil Hughes
2016-09-13Tests updatePhil Hughes
2016-09-08Merge branch 'pipeline-hooks' into 'master' Rémy Coutable
Implement Slack integration for pipeline hooks ## What does this MR do? Add pipeline events to Slack integration ## 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) - Tests - [x] Added for this feature/bug See merge request !5525
2016-09-08Fix issuable_bulk_update_path and merge request spinach testDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-06Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin
* upstream/master: (368 commits) Don't fail on an empty database Refactor authorization_for_merge_requests.md Support MySQL too, when removing gitorious from import_sources Remove gitorious from import_sources on ApplicationSetting model Add links to new docs in merge_requests.md and workflow/README.md Move merge request versions to its own document Move "Only allow merge requests to be merged if the build succeeds" to new location Move revert_changes.md to new location Move cherry_pick_changes.md to new location Move `wip_merge_requests.md` to a new location Move merge_when_build_succeeds.md to new location Fix missing flash messages on service edit page Move authorization_for_merge_requests.md to new location Move `workflow/merge_requests.md` to `user/project/merge_requests.md` Update README.md Fix randomly failing specs in expand_collapse_diff_spec: Add link on API docs index page Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12 Remove suggested colors hover underline Fix markdown anchor icon interaction ...
2016-09-02Merge branch 'master' into revert-c676283bPhil Hughes
2016-09-01Merge branch ↵Fatih Acet
'21508-inconsistency-personal-dashboard-todos-page-uses-old-interface-wrong-dropdown-filter-buttons' into 'master' Update todo view filter dropdowns ## What does this MR do? Swaps out old `select2` dropdowns on todo page with newer dropdowns. Also removes todo inline JS. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Project ![2016-08-29_14.02.57](/uploads/73d610fd41d202540f3770afa7e5266f/2016-08-29_14.02.57.gif) ### Author ![2016-08-29_14.03.40](/uploads/8ce97b81c91db06111f6a930cd5fb293/2016-08-29_14.03.40.gif) ### Type ![2016-08-29_14.04.32](/uploads/1aa050a7822de1d99ee7fdc3bbc621a3/2016-08-29_14.04.32.gif) ### Action ![2016-08-29_14.05.23](/uploads/680d19c56723a222274c3677f941cfcd/2016-08-29_14.05.23.gif) ## 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) ## What are the relevant issue numbers? Closes #21508 Related to #19866 See merge request !6072
2016-09-01Project tools visibility levelFelipe Artur
2016-09-01Added todo filter testsLuke Bennett
2016-09-01Removed select2 from todos feature specLuke Bennett
2016-08-31Fix bug where pagination is still displayed despite all todos marked as doneClement Ho
2016-08-30Merge branch 'master' into revert-c676283bPhil Hughes
2016-08-26Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin
* upstream/master: (107 commits) Fix external issue tracker "Issues" link leading to 404s Fix CHANGELOG entries related to 8.11 release. Fix changelog Reduce contributions calendar data payload Add lock_version to merge_requests table Add hover color to emoji icon Fix wrong Koding link Capitalize mentioned issue timeline notes Fix groups sort dropdown alignment Use icon helper Fix inline emoji text alignment Adds response mime type to transaction metric action when it's not HTML Moved two 8.11 changelog entries to 8.12 Fix markdown link in doc_styleguide.md Display project icon from default branch Reduce number of database queries on builds tab Update CHANGELOG Update Issue board documentation Label list shows all issues (opened or closed) with that label Update CHANGELOG ...
2016-08-26Merge branch 'capitalize-mentioned-issue-notes' into 'master' Douwe Maan
Capitalize mentioned issue timeline notes ## What does this MR do? Renames `mentioned in` to `Mentioned in` for issue timeline notes ## Are there points in the code the reviewer needs to double check? Shouldn't be any :smile: ## Why was this MR needed? Resolves existing UI inconsistency as all the other issue timeline notes have their first letter capitalized. ## What are the relevant issue numbers? Closes #21416 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-25_at_10.52.47_AM](/uploads/61de0a7d65fd739a6e565f6e63d2f52d/Screen_Shot_2016-08-25_at_10.52.47_AM.png) After: ![Screen_Shot_2016-08-25_at_10.52.05_AM](/uploads/f67f353c285453306d6b80578b11e587/Screen_Shot_2016-08-25_at_10.52.05_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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) See merge request !6028
2016-08-25Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan
Remove gitorious ## What does this MR do? Remove gitorious as import source ## Are there points in the code the reviewer needs to double check? Did I remove everything? ## Why was this MR needed? This button yielded a 404 ## What are the relevant issue numbers? Closes #17062 /cc @JobV See merge request !5866
2016-08-25Merge branch 'dz-merge-request-version'Douwe Maan
2016-08-25Capitalize mentioned issue timeline notesClement Ho
2016-08-25Remove gitoriousZ.J. van de Weg
2016-08-24Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin
* upstream/master: (1174 commits) Added CHANGELOG Added unfold test to parallel and added 'diff discussion' context Fix Spinach branches spec Better first match on this MR also Change merge_error column from string to text type Fix typo in gitlab_flow.md entities: make Environment inherit EnvironmentBasic Updated to optimized specs from !5864 Added 'with an unfolded line should not allow commenting' scenario (line 125) Added addtional 'renderable' validator to check 'data-note-type' attr exists Allow passing an index to selectRowAtIndex Fixed enter key in search input not working Fix file links on project page Files view Fix incorrect "stopped impersonation" log message 8.11 is released, long live 8.12 Also check if Akismet is enabled, before showing the `Submit as spam` button. fix location of markdown help location Fix for update 8.10-to-8.11.md doc. Appease the linter. Add Ruby 2.3 upgrade notes. ...
2016-08-23Fix Spinach branches specSean McGivern
2016-08-22Revert the revert of Optimistic LockingValery Sizov
2016-08-22Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-19Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan
Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
2016-08-19Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-19Merge branch 'master' into expiration-date-on-membershipsSean McGivern
2016-08-18Don't use global variables.Connor Shea