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-12-13Merge branch 'move-admin-settings-feature-to-rspec' into 'master' Rémy Coutable
Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 Part of #23036 See merge request !8058
2016-12-13Move admin settings spinach feature to rspecjurre
2016-12-10fix failing testsMike Greiling
2016-12-09Group links spec updatePhil Hughes
2016-12-07Updated members dropdownsPhil Hughes
This ports some code over from EE to reduce conflicts
2016-12-07Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master' Rémy Coutable
Move admin hooks spinach to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7942
2016-12-07Merge branch 'move-admin-logs-spinach-test-to-rspec' into 'master' Rémy Coutable
Move admin logs spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7945
2016-12-06Move admin hooks spinach to rspecSemyon Pupkov
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-06Move admin logs spinach test to rspecSemyon Pupkov
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-04Update effected testsZ.J. van de Weg
2016-12-01Merge branch '22781-user-generated-permalinks' into 'master' Fatih Acet
Resolve "User-generated permalink IDs collide with GitLab interface" ## What does this MR do? Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface. This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM. How this works: * All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"` * All anchor links which point to these IDs continue to use the non-namespaced hash `<a href="#foo">...</a>` * When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead. ## Before ![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif) ## After: ![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif) ![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22781 See also prior attempts to address this issue: #3908, !2023, !2024 See merge request !7631
2016-12-01remove underscore from user-content id namespaceMike Greiling
2016-12-01update gitlab flavored markdown tests to reflect namespaced idsMike Greiling
2016-12-01fix tests broken by new wiki page designMike Greiling
2016-11-29Homogenize dropdowns on Issue pageDavid Wagner
Make sort and filter dropdowns look the same and tweak their icon and colors according to #24150. Signed-off-by: David Wagner <david@marvid.fr>
2016-11-28Pass `--load-images=no` to PhantomJS via Capybara/PoltergeistRobert Speicher
We were unintentionally hitting `gravatar.com` whenever a test that used Poltergeist was run. This was certainly wasting their resources and slowing down our tests even further, for no reason.
2016-11-25Merge branch 'rephrase-system-notes' into 'master' Robert Speicher
Rephrase some system notes to be compatible with new system note style See merge request !7692
2016-11-24Merge branch 'move-admin-spam-spinach-test-to-rspec' into 'master' Rémy Coutable
Move admin spam spinach test to RSpec See merge request !7708
2016-11-24Rephrase some system notes to be compatible with new system note styleDouwe Maan
2016-11-24Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan
Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - ~~[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 - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459
2016-11-24Merge branch 'move-admin-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable
Move admin abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7691
2016-11-23Move admin abuse report spinach test to rspecSemyon Pupkov
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-11-23Move admin spam spinach test to RspecSemyon Pupkov
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-11-23Move abuse report spinach test to rspecSemyon Pupkov
part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-11-23Add nested groups support to the routingDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-22Merge branch '20840-getting-started-better-empty-state-for-issues-view' into ↵Jacob Schatz
'master' Issues empty state ## What does this MR do? Adds the empty state for the project, dashboard and group issues. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Filtered to show no issues (on group issues page in this case but also dashboard and projects) ![Screen_Shot_2016-11-08_at_20.55.56](/uploads/b598af4a8a5e2c9fbb859abf36e70e4b/Screen_Shot_2016-11-08_at_20.55.56.png) ### Project with no issues ![Screen_Shot_2016-11-08_at_20.57.08](/uploads/8f54fdf1b3101c46299249fa2944207d/Screen_Shot_2016-11-08_at_20.57.08.png) ![Screen_Shot_2016-11-08_at_20.57.17](/uploads/1d2d162e1d845dd05e945d8ebb1d2101/Screen_Shot_2016-11-08_at_20.57.17.png) ### Group with no projects with any issues ![Screen_Shot_2016-11-08_at_20.54.55](/uploads/f28dc2038839d5bda0eb37f37927d5db/Screen_Shot_2016-11-08_at_20.54.55.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 #20840 Closes #20850 See merge request !7309
2016-11-18Added empty state svg and set up blank conditionalLuke "Jared" Bennett
Added new spec step Added empty state to dashboard Split empty and filtered empty states Moved empty_state icons into their own folder and DRY up empty state html Fixed failing spec Added to groups page Review changes
2016-11-17Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into ↵Sean McGivern
'master' Adds hash anchors to diff_files to make possible linking exact file in commit Closes #24010 See merge request !7298
2016-11-16Merge branch 'move-snippet-discover-spinach-test-to-rspec' into 'master' Dmitriy Zaporozhets
Move 'Explore Snippets' Spinach feature to Rspec ## What does this MR do? It moves the `features/snippets/discover.feature` Spinach test to a Rspec feature. ## Are there points in the code the reviewer needs to double check? The original feature was called 'Discover Snippets', but the UI no longer reflects this wording. The new Rspec feature is called 'Explore Snippets' to reflect UI/Controller/View naming in use. ## Why was this MR needed? As part of deprecating the Spinach test suite. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [-] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [-] [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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23036 See merge request !7349
2016-11-16Move 'Search Snippets' Spinach feature to Rspecthe-undefined
This commit moves the `search_snippets.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. - Remove Spinach discover snippets feature and steps - Remove unused `SharedSearch` module - Add Rspec feature scenarios
2016-11-15Unify anchor link format for MR diff files !7298Yar
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path. Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage. Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format. Inspired by #24010 and !7298
2016-11-08Merge branch 'dz-refactor-namespace-regex' into 'master' Sean McGivern
Refactor namespace regex Reuse existing namespace regex constant in routing See merge request !7336
2016-11-08Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan
Use separate email-friendly token for incoming email See merge request !5914
2016-11-08Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' ↵Sean McGivern
into 'master' Network page appear with an error message when entering nonexistent git revision Closes #2362 See merge request !7172
2016-11-08Update non-exist group spinach test to match routingDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-08Move 'Explore Snippets' Spinach feature to Rspecthe-undefined
This commit moves the `snippets/discover.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. The original feature was called 'Discover Snippets', but the UI no longer reflects this wording. The new Rspec feature is called 'Explore Snippets' to reflect UI/Controller/View naming in use. - Remove Spinach discover snippets feature and steps - Add Rspec feature test
2016-11-07implements reset incoming email token on issues modal and account page,tiagonbotelho
reactivates all tests and writes more tests for it
2016-11-07Rewritten spinach git_blame tests to rspec feature testsLisanne Fellinger
Fixing rubocop violations Relocated git_blame spec and fixed styling issue Rewritten spinach git_blame tests to rspec feature tests Fixing rubocop violations Relocated git_blame spec and fixed styling issue Rewritten spinach git_blame tests to rspec feature tests Fixing rubocop violations Rewritten spinach git_blame tests to rspec feature tests Fixing rubocop violations Rewritten spinach git_blame tests to rspec feature tests Fixing rubocop violations Relocated git_blame spec and fixed styling issue
2016-11-06Fix spinach testHiroyuki Sato
2016-11-05Merge branch 'move-public-snippets-feature-to-rspec' into 'master' Robert Speicher
Move Spinach public snippet feature test to RSpec feature See #23036 See merge request !7256
2016-11-04Fix diff_comments failureAnnabel Dunstone Gray
2016-11-04Move spinach public snippet feature to rspec specthe-undefined
- Add rspec feature for public snippets - Remove spinach test for public snippets
2016-11-04Show log corresponding to env in admin/logsLukas Erlacher
No matter which environment Gitlab was running as, the admin/logs view always showed production.log. This commit selects the logfile based on Rails.env. - Rename ProductionLogger to EnvironmentLogger - Make EnvironmentLogger logfile depend on env - Update spinach test for log tabs
2016-11-02Merge branch 'create_hooks_rake' into 'master' Rémy Coutable
Add Rake task to create/repair GitLab Shell hooks symlinks ## What does this MR do? Adds a Rake task wrapper around `gitlab-shell` `bin/create_hooks` script. This makes it easier for an administrator to repair hooks symlinks without worrying about where repository data is located, etc. Just run this task and it takes care of everything based on current configuration. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? `bin/create_hooks` was not well-documented. It requires parameters specifying where repository data is located. It also needs to be run by the `git` user. Wrapping it in a Rake task allows us to take current configuration in to account and makes it easier on the administrator. See merge request !5634
2016-11-01Add Rake task to create/repair GitLab Shell hooks symlinksDrew Blessing
2016-11-01Fix spinach testsAnnabel Dunstone Gray
2016-10-28Fix commits specAnnabel Dunstone Gray
2016-10-26Finish updates to use JIRA gemFelipe Artur
Code improvements, bug fixes, finish documentation and specs
2016-10-21Disable warming of the asset cache in Spinach tests under CIStan Hu
I suspect some combination of Knapsack tests cause no regular Rack tests to be loaded (i.e. all JavaScript tests), which leads to the error: ArgumentError: rack-test requires a rack application, but none was given In CI, we precompile all the assets so there is no need to warm the asset cache in any case. Closes #23613
2016-10-20Differentiate the expire from leave eventCallum Dryden
At the moment we cannot see weather a user left a project due to their membership expiring of if they themselves opted to leave the project. This adds a new event type that allows us to make this differentiation. Note that is not really feasable to go back and reliably fix up the previous events. As a result the events for previous expire removals will remain the same however events of this nature going forward will be correctly represented.