summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Removed references to subscribe-button CSS classPhil Hughes2016-04-128-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were being blocked by adblocks Closes #15043
* | | | | | | | | | | | | | Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-1429-8/+445
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto git fsck Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 See merge request !3232
| * | | | | | | | | | | | | | Update CHANGELOG for "Auto git fsck"Robert Speicher2016-04-141-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Shut up, RubocopRobert Speicher2016-04-141-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | More create_listauto-fsckJacob Vosmaer2016-04-141-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Documentation / help improvementsJacob Vosmaer2016-04-143-5/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-13124-491/+4249
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use more conservative limitsJacob Vosmaer2016-04-133-9/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Schema improvements suggested by YorickJacob Vosmaer2016-04-132-2/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Clear repository check columns asynchronouslyJacob Vosmaer2016-04-1311-121/+150
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove \f. WT\F ??Jacob Vosmaer2016-04-131-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use new "clear all" button in testsJacob Vosmaer2016-04-132-36/+49
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Always check the wiki tooJacob Vosmaer2016-04-131-2/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make check result staleness more obviousJacob Vosmaer2016-04-131-1/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Improve English, thanks RobertJacob Vosmaer2016-04-131-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | More code changes, thanks RobertJacob Vosmaer2016-04-132-20/+24
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Changes suggested by RobertJacob Vosmaer2016-04-124-7/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | BastaJacob Vosmaer2016-04-122-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-12291-1391/+4124
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Move 'clear checks' button to applicatoin settingsJacob Vosmaer2016-04-126-43/+32
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add a 'circuit breaker' for repo checksJacob Vosmaer2016-04-124-1/+31
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add repository_checks_enabled settingJacob Vosmaer2016-04-123-2/+9
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Increase fsck lock timeout to 24 hoursJacob Vosmaer2016-04-121-1/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Rename almost all the thingsJacob Vosmaer2016-04-0623-112/+112
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Document how to disable repo checksJacob Vosmaer2016-04-061-0/+16
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Rebase repo check MRJacob Vosmaer2016-04-0420-6/+346
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'fix-group-projects-sort' into 'master' Robert Speicher2016-04-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects on group page should be sorted by last activity instead of id/created_at Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #15237 See merge request !3716
| * | | | | | | | | | | | | | | | Projects on group page should be sorted by last activity instead of ↵fix-group-projects-sortDmitriy Zaporozhets2016-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | id/created_at Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' Rémy Coutable2016-04-1410-16/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix revoking of authorized OAuth applications Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized. Added a spec and also found that the `gon` variables were not being set for this view. Closes #14370 See merge request !3690
| * | | | | | | | | | | | | | | | | Include GonHelper separately and remove created_at in factoryStan Hu2016-04-144-3/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add spec for deletion of authorized OAuth2 applicationStan Hu2016-04-1410-15/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14370 Move gon function into its own helper
| * | | | | | | | | | | | | | | | | Fix the improper delete form being rendered for an oauth_authorized_applicationconnorshea2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the authorized applications not being revoked properly at `/profile/applications`. Fixes #14370.
* | | | | | | | | | | | | | | | | | Merge branch 'issue_15155' into 'master' Rémy Coutable2016-04-144-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setup visibility level for project when transfering for a group fixes #15155 See merge request !3707
| * | | | | | | | | | | | | | | | | | Change transfer service to use existing methodsFelipe Artur2016-04-141-15/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add changelog entryissue_15155Felipe Artur2016-04-131-0/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Setup visibility level for project when transfering for a groupFelipe Artur2016-04-133-4/+41
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'rake-db-reset' into 'master' Robert Speicher2016-04-143-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use rake db:reset instead of db:setup See merge request !3721
| * | | | | | | | | | | | | | | | | Use rake db:reset instead of db:setupYorick Peterse2016-04-143-3/+3
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using db:reset ensures existing tables are first dropped. This in turn ensures that we can drop tables regardless of any foreign key constraints. While CE currently doesn't have any foreign keys EE defines the following relation: remote_mirrors.project_id -> projects.id MySQL will complain whenever you try to drop the "projects" table first even when using "DROP TABLE ... CASCADE".
* | | | | | | | | | | | | | | | | Merge branch 'start-with-iid-on-new-branch' into 'master' Rémy Coutable2016-04-145-10/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start with iid on branch creation After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name. See merge request !3708
| * | | | | | | | | | | | | | | | | Start with iid on branch creationZeger-Jan van de Weg2016-04-145-10/+17
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-04-141-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update shibboleth configuration for GitLab 8.6 and Apache 2.4 See merge request !3713
| * | | | | | | | | | | | | | | | | Update shibboleth configuration for GitLab 8.6 and Apache 2.4Tom Downes2016-04-141-0/+47
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'toc_gitlab_ci_yml' into 'master' Achilleas Pipinellis2016-04-141-16/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add TOC to yaml README and an intro section See merge request !3719
| * | | | | | | | | | | | | | | | Add TOC to yaml README and an intro sectionAchilleas Pipinellis2016-04-141-16/+57
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Added CHANGELOG itemdiff-hash-locationPhil Hughes2016-04-141-0/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fixed issue with other links being clicked in diffsPhil Hughes2016-04-141-2/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Correctly scrolls to the line when clickingPhil Hughes2016-04-141-2/+10
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Diff viewer links to correct part of the filePhil Hughes2016-04-147-8/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added highlight colours to diff rows Closes #13852
* | | | | | | | | | | | | | | | Merge branch 'simplify-gitlab-url_builder-15202' into 'master' Rémy Coutable2016-04-149-101/+147
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and expose only Gitlab::UrlBuilder.build(record) ``` $ git grep Gitlab::UrlBuilder app/models/commit.rb: url: Gitlab::UrlBuilder.build(self), app/services/issues/base_service.rb: issue_url = Gitlab::UrlBuilder.build(issue) app/services/merge_requests/base_service.rb: hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request) app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note) lib/gitlab/note_data_builder.rb: base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note) spec/lib/gitlab/note_data_builder_spec.rb: expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note)) spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do ``` Fixes #15202. See merge request !3696
| * | | | | | | | | | | | | | | Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202Rémy Coutable2016-04-139-101/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>