summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-rails-routes' into 'master' Douwe Maan2016-03-231-0/+12
|\ | | | | | | | | | | | | Add special cases for built-in Rails routes in development See merge request !3369
| * Add special cases for built-in Rails routes in developmentRobert Speicher2016-03-221-0/+12
| |
* | Fix an issue causing the Dashboard/Milestones page to be blankRémy Coutable2016-03-231-2/+1
|/
* Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-212-0/+8
|\
| * Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable2016-03-212-0/+8
| |\ | | | | | | | | | | | | | | | | | | Backport premailer and diff changes from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !3318
| | * Inline mailer CSS using premailer.Douwe Maan2016-03-192-0/+8
| | | | | | | | | | | | | | | # Conflicts: # Gemfile.lock
* | | Soft delete issuablesZeger-Jan van de Weg2016-03-191-2/+2
|/ /
* | Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-1814-89/+366
|\ \ | |/
| * Fixes issue on dashboard issuesPhil Hughes2016-03-181-0/+2
| | | | | | | | They would try to load JSON from a project even though it isn't a single project
| * Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro2016-03-161-0/+6
| |
| * Merge branch 'support-utf8-wiki-page-title' into 'master' Douwe Maan2016-03-161-0/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Wiki with UTF-8 page name ## What does this MR do? Support Wiki with UTF-8 page name. See https://github.com/gollum/gollum/pull/929 ## Why was this MR needed? Relax constraints for wiki slug in aac6598482036e12a20b4c75f2a508bd6a017245. It allows to create a wiki with UTF-8 name, but creating a wiki with UTF-8 name causes 500 error. Creating a wiki with UTF-8 name once, then creating or updating wiki with ascii name also cause 500 error i.e. no one can create and update any wiki pages in the project. ## Workaround 1. Go to `https://DOMAIN/repo/wikis/git_access` -> this page display the link to git clone 2. Clone the wiki repo 3. Find the page with UTF-8 name 4. Rename or Delete these files 5. Commit and push ## What are the relevant issue numbers? - #13979 - #13891 - #13698 - #13603 - #13317 - #12906 - #12825 - #10945 ## Todo - [x] Waiting for 'gollum-rugged_adapter' that support rugged v0.24.0 release 'gollum-rugged_adapter' gem doesn't allow to install rugged v0.24.0 (it's still beta version), but 'gitlab_git' gem depends on rugged v0.24.0b13. So it can't install both 'gollum-rugged_adapter' and 'gitlab_git' now. See merge request !2999
| | * Support Wiki with UTF-8 page nameHiroyuki Sato2016-03-161-0/+13
| | |
| * | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
| * Merge branch 'application-settings' into 'master' Robert Speicher2016-03-151-1/+1
| |\ | | | | | | | | | | | | | | | | | | Applications tab on profile settings Closes #13855 See merge request !3031
| | * Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settingsRobert Speicher2016-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previously we were doing all of kinds of code gymnastics and flash abuse in order to work with a Doorkeeper controller but have it _appear_ at the `/profile/applications` path. Fortunately we can just tell Rails to use a different controller to handle that route, and we get the best of both worlds.
| * | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-141-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
| | * | Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-111-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-121-0/+1
| | | | | | | | | | | | This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
| * | | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-121-1/+0
| | | | | | | | | | | | This reverts merge request !3191
| * | | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-121-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Golang subpackage fetching Closes #13805 See merge request !3191
| | * | | Support Golang subpackage fetchingsupport-go-subpackagesStan Hu2016-03-121-0/+1
| | |/ / | | | | | | | | | | | | Closes #13805
| * | | Merge branch 'filter-import-url' into 'master' Douwe Maan2016-03-121-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter import_url params because they may contain auth information. Fixes #14199 cc @dzaporozhets @DouweM tagging you since this is security related. See merge request !3174
| | * | | Filter import_url params because they may contain auth information. Fixes #14199filter-import-urlJosh Frye2016-03-101-1/+1
| | |/ /
| * | | Merge branch 'rs-issue-12944' into 'master' Douwe Maan2016-03-111-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a custom Devise failure app to handle unauthenticated .zip requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 See merge request !2828
| | * | | Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944Robert Speicher2016-03-081-5/+5
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
| * | | | Disable Rubocop for PostgreSQL patchesYorick Peterse2016-03-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This code is mostly a copy-paste from existing pull requests so there's no point in running Rubocop on it.
| * | | | Patch MySQL to ignore PostgreSQL schema optionsYorick Peterse2016-03-111-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures that options such as `using: :gin` and PostgreSQL operator classes are ignored when loading a schema into a MySQL database.
| * | | | Backport Rails support for PostgreSQL opclassesYorick Peterse2016-03-111-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to support creating/dumping/loading indexes that use the gin_trgm_ops operator class on PostgreSQL. These changes are taken from Rails pull request https://github.com/rails/rails/pull/19090.
| * | | | Merge branch 'group-activity-separate-tab' into 'master' Robert Speicher2016-03-111-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move group activity feed to separate page for consistency with dashboard and project pages Fixes #14161. Part of #13480 See merge request !3157
| | * | | Move group activity feed to separate page for consistency with dashboard and ↵Dmitriy Zaporozhets2016-03-101-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | project pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Parse config/resque.yml in one place onlyJacob Vosmaer2016-03-094-36/+13
| |/ /
| * | Merge branch 'remove-duplicate-cache_store-in-test-config' into 'master' Robert Speicher2016-03-081-2/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate 'cache_store' configuration in test environment [ci skip] See merge request !3061
| | * | Remove duplicate 'cache_store' configuration in test environmentremove-duplicate-cache_store-in-test-configRémy Coutable2016-03-021-2/+0
| | | |
| * | | Don't generate factories automaticallyRobert Speicher2016-03-041-0/+4
| | |/ | |/|
| * | Remove `Profile::KeysController#new` actionRobert Speicher2016-03-031-1/+1
| | |
| * | Merge branch 'improve-user-tabs' into 'master' Jacob Schatz2016-03-031-0/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add routes and actions for dynamic tab loading. Closes #13588 and #13584 See merge request !2961
| | * \ Merge branch 'master' into improve-user-tabsAlfredo Sumaran2016-03-012-8/+10
| | |\ \ | | | |/
| | * | Make url and actions to be the same nameAlfredo Sumaran2016-03-011-2/+2
| | | |
| | * | Add routes and actions for dynamic tab loadingJosh Frye2016-02-291-0/+9
| | | |
| * | | Merge branch 'mail-room-config-without-rails' into 'master' Douwe Maan2016-03-022-41/+50
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Don't load all of GitLab in mail_room Fixes #12731 cc @jacobvosmaer See merge request !3005
| | * | Don't load all of GitLab in mail_roomDouwe Maan2016-02-262-41/+50
| | | | | | | | | | | | | | | | Fixes #12731
| * | | Use dedicated relative_url.rb initializerArtem Sidorenko2016-02-292-8/+10
| | |/ | |/| | | | | | | in order to have it the same way like in omnibus
| * | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-261-0/+13
| |/ | | | | | | | | The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
* | Easily (un)mark merge request as WIP using linkDouwe Maan2016-02-261-0/+1
|/ | | | Fixes #3768
* Merge branch 'bring-back-newrelic-gem' into 'master' Rémy Coutable2016-02-241-0/+16
|\ | | | | | | | | | | | | | | | | | | Revert "Remove newrelic gem. Closes #12860" This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock See merge request !2943
| * Revert "Remove newrelic gem. Closes #12860"Stan Hu2016-02-231-0/+16
| | | | | | | | | | | | | | This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock
* | Merge branch 'issue_13301_emoji-menu' into 'master' Robert Speicher2016-02-241-0/+2
|\ \ | |/ |/| | | | | | | | | Load award emoji picker with ajax request Fixes #13301. See merge request !2888
| * Create EmojisControllerAnnabel Dunstone2016-02-221-1/+2
| |
| * Load award emoji picker with ajax requestAnnabel Dunstone2016-02-181-0/+1
| |
* | Properly set `auto_link_saml_user` default value in the Settings loader.Patricio Cano2016-02-221-0/+1
| |