| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
'master'
Adds hash anchors to diff_files to make possible linking exact file in commit
Closes #24010
See merge request !7298
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |/
|/|
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Refactor namespace regex
Reuse existing namespace regex constant in routing
See merge request !7336
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Use separate email-friendly token for incoming email
See merge request !5914
|
| | | | |
| | | |
| | | |
| | | | |
reactivates all tests and writes more tests for it
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 'master'
Network page appear with an error message when entering nonexistent git revision
Closes #2362
See merge request !7172
|
| | | |/
| |/| |
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| |/
|/|
| |
| |
| |
| | |
Move Spinach public snippet feature test to RSpec feature
See #23036
See merge request !7256
|
| | |
| |
| |
| |
| | |
- Add rspec feature for public snippets
- Remove spinach test for public snippets
|
| | | |
|
| |/
|
|
|
|
|
|
|
|
| |
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
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| |/ |
|
| | |
|
| |
|
|
| |
Code improvements, bug fixes, finish documentation and specs
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
| |
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.
|
| | |
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\
| |
| |
| |
| |
| |
| | |
Fix randomly crashing spinach test for merge request
For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378
See merge request !6932
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |
|
| |/
|
|
| |
and will always include carriage returns
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Fix trending projects Spinach failure
The trending projects list is now pre-calculated. To make this work with the Spinach test, we have to manually refresh the list.
Partial fix to #23378
See merge request !6911
|
| | |
| |
| |
| |
| |
| |
| | |
The trending projects list is now pre-calculated. To make this work
with the Spinach test, we have to manually refresh the list.
Partial fix to #23378
|
| | | |
|
| | |
| |
| |
| | |
Partial fix to #23378
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Fix active tab test for branches page
For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378
See merge request !6923
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |/ /
| |
| |
| |
| |
| |
| |
| | |
gitlab-git-test `master` was updated in ff076d88, and this caused
the merge request diffs to change in a way that broke assumptions in the
Spinach tests.
Partial fix to #23378
|
| |/
|
|
|
|
|
| |
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
|
| |\ |
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |/
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Project members UI
## What does this MR do?
New UI for project members that includes groups.
## Screenshots (if relevant)
### Project members
### Group members
## What are the relevant issue numbers?
Part of #19868
Closes #21320
See merge request !6148
|
| | |\ |
|
| | |\ \ |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
Fixed issue with group name not showing
|
| | | | | |
|
