Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change all `:empty_project` to `:project`rs-empty_project-default | Robert Speicher | 2017-08-02 | 170 | -211/+211 |
| | |||||
* | Merge branch 'rs-empty_project-cleanup' into 'master' | Rémy Coutable | 2017-08-02 | 7 | -8/+8 |
|\ | | | | | | | | | Ensure all project factories use `:repository` trait or `:empty_project` See merge request !13238 | ||||
| * | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanup | Robert Speicher | 2017-08-01 | 7 | -8/+8 |
| | | |||||
* | | Add filtered search to group issue dashboard | Clement Ho | 2017-08-02 | 1 | -5/+5 |
|/ | |||||
* | Merge branch '28283-legacy-storage-format' into 'master' | Sean McGivern | 2017-08-01 | 3 | -29/+29 |
|\ | | | | | | | | | [CE] Added Legacy Storage format See merge request !13149 | ||||
| * | Rename more path_with_namespace -> full_path or disk_path | Gabriel Mazetto | 2017-08-01 | 1 | -1/+1 |
| | | |||||
| * | Rename many path_with_namespace -> full_path | Gabriel Mazetto | 2017-08-01 | 2 | -28/+28 |
| | | |||||
* | | Inline script cleanup globals and easy | Tim Zallmann | 2017-08-01 | 1 | -2/+2 |
|/ | |||||
* | Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'cherry-pick-41db362c | Rémy Coutable | 2017-07-28 | 1 | -1/+3 |
| | | | | | Resolve "Impersonation Tokens creation spec failure in admin_users_impersonation_tokens_spec.rb" See merge request !13145 | ||||
* | Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵ | Robert Speicher | 2017-07-28 | 2 | -17/+5 |
|\ | | | | | | | | | | | | | | | | | 'master' Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Closes #35599 See merge request !13126 | ||||
| * | Fix a spec that was assuming to be on the wrong page35599-fix-uncontrolled-default_url_options-overriding | Rémy Coutable | 2017-07-28 | 1 | -6/+4 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵ | Rémy Coutable | 2017-07-28 | 1 | -11/+1 |
| | | | | | | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'rs-fix-master' into 'master' | Robert Speicher | 2017-07-28 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | Fix spec/features/projects/branches_spec See merge request !13163 | ||||
| * | | Fix spec/features/projects/branches_spec | Robert Speicher | 2017-07-28 | 1 | -3/+3 |
| |/ | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8666 | ||||
* | | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master' | Douwe Maan | 2017-07-28 | 1 | -0/+27 |
|\ \ | |/ |/| | | | | | | | | | Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137 | ||||
| * | Fix replying to commit comments on MRs from forks | Sean McGivern | 2017-07-28 | 1 | -0/+27 |
| | | | | | | | | | | | | A commit comment shows in the MR, but if the MR is from a fork, it will have a different project ID to the MR's target project. In that case, add an note_project_id param so that we can pick the correct project for the note. | ||||
* | | Merge branch 'rs-empty_project-features' into 'master' | Rémy Coutable | 2017-07-28 | 148 | -213/+217 |
|\ \ | | | | | | | | | | | | | Use `:empty_project` where possible in feature specs See merge request !13118 | ||||
| * | | Use `empty_project` where possible in spec/features/securityrs-empty_project-features | Robert Speicher | 2017-07-27 | 6 | -6/+9 |
| | | | |||||
| * | | Use `empty_project` where possible in spec/features/merge_requests | Robert Speicher | 2017-07-27 | 29 | -42/+42 |
| | | | |||||
| * | | Use `empty_project` where possible in spec/features/issues | Robert Speicher | 2017-07-27 | 18 | -30/+30 |
| | | | |||||
| * | | Use `empty_project` where possible in spec/features/projects | Robert Speicher | 2017-07-27 | 73 | -97/+95 |
| | | | |||||
| * | | Use `empty_project` where possible in spec/features/issuables | Robert Speicher | 2017-07-27 | 2 | -3/+3 |
| | | | | | | | | | | | | (It wasn't possible.) | ||||
| * | | Use `empty_project` where possible in spec/features/atom | Robert Speicher | 2017-07-27 | 4 | -5/+5 |
| | | | |||||
| * | | Use `empty_project` where possible in spec/features/profiles | Robert Speicher | 2017-07-27 | 1 | -3/+3 |
| | | | |||||
| * | | Use `empty_project` where possible in spec/features/explore | Robert Speicher | 2017-07-27 | 1 | -1/+1 |
| | | | |||||
| * | | Use `empty_project` where possible in spec/features/groups | Robert Speicher | 2017-07-27 | 3 | -5/+5 |
| | | | |||||
| * | | Use `empty_project` where possible in spec/features/admin | Robert Speicher | 2017-07-27 | 4 | -11/+14 |
| | | | |||||
| * | | Use `empty_project` where possible in spec/features/dashboard | Robert Speicher | 2017-07-27 | 7 | -10/+10 |
| |/ | |||||
* | | Merge branch '32483-jira-error' into 'master' | Sean McGivern | 2017-07-28 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Display specific error message when JIRA test fails Closes #32483 See merge request !13100 | ||||
| * | | Display specific error message when JIRA test fails32483-jira-error | Jarka Kadlecova | 2017-07-27 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master' | Robert Speicher | 2017-07-27 | 1 | -1/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Prevent concurrent editing wiki Closes #1827 See merge request !9707 | ||||
| * | | | Remove unnecessary code | Hiroyuki Sato | 2017-07-26 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge branch 'master' into 1827-prevent-concurrent-editing-wiki | Hiroyuki Sato | 2017-07-23 | 361 | -5296/+15076 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/projects/wikis_controller.rb app/views/projects/wikis/edit.html.haml spec/features/projects/wiki/user_updates_wiki_page_spec.rb | ||||
| * | | | | Refactor spec | Hiroyuki Sato | 2017-03-09 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Prevent concurrent editing wiki | Hiroyuki Sato | 2017-03-08 | 1 | -1/+11 |
| | | | | | |||||
* | | | | | Merge branch 'backport-ee-2456' into 'master' | Robert Speicher | 2017-07-27 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Skip OAuth authorization for trusted applications See merge request !13061 | ||||
| * | | | | | Backport gitlab-ee!2456 | Oswaldo Ferreira | 2017-07-27 | 1 | -0/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'feature/gpg-signed-commits' into 'master' | Dmitriy Zaporozhets | 2017-07-27 | 2 | -0/+159 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | GPG signed commits Closes #20268 See merge request !9546 | ||||
| * | | | | fetch gpg signature badges by ajax | Alexis Reigel | 2017-07-27 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | use short project path helpers | Alexis Reigel | 2017-07-27 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | swap user's name and the user's username | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | show gpg key's user info when no profile exists | Alexis Reigel | 2017-07-27 | 1 | -3/+20 |
| | | | | | |||||
| * | | | | user may now revoke a gpg key | Alexis Reigel | 2017-07-27 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | other than just removing a key, which doesn't affect the verified state of a commit, revoking a key unverifies all signed commits. | ||||
| * | | | | improve spacing / alignments in gpg popup | Alexis Reigel | 2017-07-27 | 1 | -7/+7 |
| | | | | | |||||
| * | | | | use sign_in instead of login_with | Alexis Reigel | 2017-07-27 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | remove the :gpg rspec tag | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | since everything (except the CurrentKeyChain method) operates on a tempoary keychain anyway we don't need this anymore. | ||||
| * | | | | use updated gitlab-test repo for signed commits | Alexis Reigel | 2017-07-27 | 1 | -19/+5 |
| | | | | | |||||
| * | | | | add gpg commit popover badges | Alexis Reigel | 2017-07-27 | 1 | -0/+25 |
| | | | | | |||||
| * | | | | perform signature update in sidekiq worker | Alexis Reigel | 2017-07-27 | 1 | -4/+10 |
| | | | | | |||||
| * | | | | update features specs for gpg commits | Alexis Reigel | 2017-07-27 | 1 | -13/+38 |
| | | | | |