summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Update to send changed password notification emailsTom Bell2016-08-051-0/+3
| | | | | Add the devise initializer config setting to enable the sending of notification emails when a user changes their password.
* Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Import/Export not working in HA mode Use a shared path instead of `Tempfile` default `/tmp` so the import file is accessible by any GitLab instance. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20506 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5618
| * using shared path for project import uploads and refactored gitlab remove ↵James Lopez2016-08-041-3/+3
| | | | | | | | export worker
* | Instrument Gitlab::Highlightinstrument-gitlab-highlightYorick Peterse2016-08-031-0/+3
| | | | | | | | | | This class does quite a few interesting things so let's instrument it so we can see how much time is being spent in this class.
* | Merge branch 'branches-ending-with-json' into 'master' Douwe Maan2016-08-021-7/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow branch names ending with .json for graph and network page ## What does this MR do? Allow branch names to end with `.json` for graph and network page. ## Why was this MR needed? Displaying branches ending on `.json` in repository view crashes because links to graph and network page can not be determined. ## What are the relevant issue numbers? fixes #20462, #19585 See merge request !5579
| * | Allow branch names ending with .json for graph and network page (!5579)winniehell2016-08-021-7/+11
| |/
* | Instrument the Repository classinstrument-repository-classYorick Peterse2016-08-021-0/+1
|/ | | | | Since this isn't an ActiveRecord::Base descendant it wasn't instrumented.
* Fix RequestProfiler::Middleware error when code is reloaded in developmentfix/request-profiler-middleware-error-on-reloadAhmad Sherif2016-08-011-0/+2
| | | | Closes #20452
* Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an URL field to Enviroments ## What does this MR do? Adds a field to the `enviroments` table to expose later in other features. Now I see the task list below, I noticed I forgot some minor things, but Ill adress those after the first review. ## Are there points in the code the reviewer needs to double check? The field is a string on the database, thus limited to 255 chars, which seems more than enough. ## What are the relevant issue numbers? Closes #19527 ## Screenshots (if relevant) ![Screen_Shot_2016-07-25_at_15.22.16](/uploads/5c3f39466f8e2114195270006aed20c0/Screen_Shot_2016-07-25_at_15.22.16.png)![Screen_Shot_2016-07-25_at_15.22.53](/uploads/408cf86610137dd4a861d15dcd677a2c/Screen_Shot_2016-07-25_at_15.22.53.png)![Screen_Shot_2016-07-25_at_15.23.10](/uploads/927c506931f4e0338cdbbc58678bd308/Screen_Shot_2016-07-25_at_15.23.10.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5469
| * Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-291-1/+1
| | | | | | | | Also a couple of minor edits for this branch are included
| * Add an URL field to EnvironmentsZ.J. van de Weg2016-07-291-1/+1
| | | | | | | | | | This MR adds a string (thus max 255 chars) field to the enviroments table to expose it later in other features.
* | Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.lookatmike2016-07-311-0/+2
|/
* Change requests_profiles resource constraint to catch virtually any filefix/requests-profiles-controller-does-not-catch-certain-filesAhmad Sherif2016-07-271-1/+1
|
* Merge branch '14584-remove-routes-that-we-do-not-use-anymore' into 'master' Rémy Coutable2016-07-271-12/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove routes that we do not use anymore" _Originally opened at !4059 by @strzibny._ - - - ## What does this MR do? > I tried to clean up the routes as mentioned in #14584 I used the following script and manually verified the changes: https://gist.github.com/strzibny/4ccbda7dcf67ef6719dcb047014e1ea7 After this patch, the script still gives me the following routes: Unused routes (7): oauth/authorizations#show doorkeeper/tokens#create doorkeeper/tokens#revoke oauth/applications#edit oauth/applications#show doorkeeper/token_info#show omniauth_callbacks#(?-mix:(?!)) Here is a relevant code from doorkeeper on drawing these routes: https://github.com/doorkeeper-gem/doorkeeper/blob/5ea4575863781940fe6996692c6b41f2ad71d90e/lib/doorkeeper/rails/routes.rb#L25 ## What are the relevant issue numbers? Closes #14584. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5499
| * Remove useless new route14584-remove-routes-that-we-do-not-use-anymoreRémy Coutable2016-07-271-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Add route for Import::GithubController#newRémy Coutable2016-07-261-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Clean up unused routesJosef Strzibny2016-07-261-14/+12
| |
* | Merge branch '20124-disable-repository-validation-during-precompile-step' ↵Stan Hu2016-07-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add ENV variable to skip repository storages validations Closes #20124 See merge request !5478
| * | Add ENV variable to skip repository storages validations20124-disable-repository-validation-during-precompile-stepAlejandro Rodríguez2016-07-251-1/+1
| | |
* | | Whitelist 'Simplified BSD' licenseDouwe Maan2016-07-261-12/+19
| | |
* | | Profile requests when a header is passedfeature/profile-requests-conditionallyAhmad Sherif2016-07-263-0/+7
| |/ |/|
* | Enable SIDEKIQ_REQUEST_STORE by defaultadd-sidekiq-request-storeStan Hu2016-07-251-1/+1
| |
* | Add support for using RequestStore within Sidekiq tasks via ↵Stan Hu2016-07-251-0/+1
|/ | | | | | | | | SIDEKIQ_REQUEST_STORE env variable This significantly reduces the DB churn in the PostReceive task when it performs reference extraction. See #18663
* Instrument Nokogiri parsing methodsYorick Peterse2016-07-251-0/+7
| | | | | This allows us to see how much time is being spent in just parsing HTML/XML documents.
* Ignore invalid trusted proxies in X-Forwarded-For headerreject-invalid-trusted-proxiesStan Hu2016-07-231-2/+8
| | | | | | | Certain reverse proxies can send invalid IP addresses in the X-Forwarded-For header For example, Apache can send (null). Closes #20194
* Skip repository storage path valitaions on test environmentAlejandro Rodríguez2016-07-211-6/+10
| | | | | Storage path are not created until `TestEnv.init`, so we must skip their validation on initialization.
* Use Pathname to make the repository storage path validations more robustAlejandro Rodríguez2016-07-211-5/+6
|
* Avoid data-integrity issue when repository_downloads_path is incorrectlyDouglas Barbosa Alexandre2016-07-211-1/+15
|
* Update default path for repository_downloads_path in gitlab.yml.exampleDouglas Barbosa Alexandre2016-07-211-2/+2
|
* Merge branch '4142-show-inline-video' into 'master' Rémy Coutable2016-07-211-2/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff) ## What does this MR do? It adds support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff). Most of the work was done by @hayesr in !3508 but a few improvements were still missing. ## Why was this MR needed? To be able to play uploaded videos in GitLab! ## What are the relevant issue numbers? Closes #4142. ## Screenshots ### Video players ![Screen_Shot_2016-07-19_at_18.44.09](/uploads/e85e531b455a41c3e66b26b356abaafd/Screen_Shot_2016-07-19_at_18.44.09.png) ----- ![Screen_Shot_2016-07-19_at_18.44.29](/uploads/05f52a812760210d1eae86a7f8fc48bc/Screen_Shot_2016-07-19_at_18.44.29.png) ----- ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Test `VideoLinkFilter` - [x] Test in `spec/features/markdown_spec.rb` - [x] Improve `spec/uploaders/file_uploader_spec.rb` - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5215
| * Don't allow `.ogg` as a valid video extension4142-show-inline-videoRémy Coutable2016-07-211-1/+1
| | | | | | | | | | | | `.ogg` is for music files. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Remove duplication, useless rescue, and avoid using ActionViewRémy Coutable2016-07-191-4/+2
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * First support of videos in issues, MRs and notesEric Hayes2016-07-191-2/+8
| | | | | | | | | | * Registered video MIME types * Currently supporting browser-supported formats with extensions that match the mime type
* | Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher2016-07-201-109/+0
| | | | | | | | | | This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
* | Revert "Merge branch 'remove-csp-sentry-reporting' into 'master' "Robert Speicher2016-07-201-2/+12
| | | | | | | | | | This reverts commit 79b02e40e5842540ceff4454f6c2c51f13fc081c, reversing changes made to f2cd21e8946dcef13e8be408b96b079b5ced682a.
* | Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to block sign ups using a domain blacklist. As part of this MR, I restructured the Application Settings form to separate **Sign up** related settings from **Sign in** related settings and make everything cleaner and easier to read. Fixes #19749 Related to #5573 See merge request !5259
| * | Refactor and rename `restricted_signup_domains` to `domain_whitelist` to ↵Patricio Cano2016-07-181-1/+1
| | | | | | | | | | | | better conform to its behavior and newly introduced behavior.
* | | Merge branch '15343-build-settiings' into 'master' Rémy Coutable2016-07-201-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move Build badges settings to Builds page (or Builds settings)" ## What does this MR do? Removes pipeline settings section from project settings & creates a new pipelines settings page Adds builds badge to pipelines settings page & removes badge page ## Are there points in the code the reviewer needs to double check? All Rails updates -> particularly `builds_controller.rb` and `routes` Spacing needs to be updated across all settings pages and will be in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/issues/19827) ## What are the relevant issue numbers? Closes #15343 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-19_at_5.47.29_AM](/uploads/48e6d203de4cbe0b697280128695d980/Screen_Shot_2016-07-19_at_5.47.29_AM.png) ![Screen_Shot_2016-07-14_at_9.25.13_AM](/uploads/59118440f3e7bb903f44260abb119376/Screen_Shot_2016-07-14_at_9.25.13_AM.png) See merge request !5244
| * | | Create PipelinesSettingsController for showing settings pageKamil Trzcinski2016-07-201-1/+3
| | | |
| * | | Update routesKamil Trzcinski2016-07-201-4/+1
| | | |
| * | | Merge remote-tracking branch 'origin/master' into 15343-build-settiingsKamil Trzcinski2016-07-202-5/+21
| |\ \ \
| * | | | Move Pipelines settings under ↵Kamil Trzcinski2016-07-191-1/+5
| | | | | | | | | | | | | | | | | | | | `gitlab.com/gitlab-org/gitlab-ce/pipelines/settings`
| * | | | Remove builds settings from project settings; add builds settings route; add ↵Annabel Dunstone2016-07-191-1/+2
| | | | | | | | | | | | | | | | | | | | new controller action; put badge stuff under builds settings controller action
* | | | | Merge branch 'rename-js-files' into 'master' Fatih Acet2016-07-201-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace namespace-specific application.js files with namespace-bundle.js files. Following up on the per-page JavaScript improvements, I wanted to replace the use of `application.js` with `namespace-bundle.js` to prevent confusion when downloading more than one application.js file. This is pretty much just for the sake of clarity. cc: @alfredo1 See merge request !5221
| * | | | | Replace namespace-specific application.js files with namespace-bundle.js files.rename-js-filesConnor Shea2016-07-151-4/+4
| | | | | |
* | | | | | Log cron_jobs configuration instead of raising exceptionGabriel Mazetto2016-07-201-1/+2
| | | | | |
* | | | | | Fix the Sentry spam from CSP violations by disabling it.Connor Shea2016-07-191-12/+2
| |_|/ / / |/| | | |
* | | | | Fix help page paths to make sure shortcuts and the UI help page work.fix-help-pathsConnor Shea2016-07-191-5/+4
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Add a test to make sure the help page UI path doesn't break in the future. Fix #19972 and #19889.
* | | | Merge branch 'manual-actions' into 'master' Rémy Coutable2016-07-192-0/+17
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for manual CI actions ## What does this MR do? This implements a `when: manual` which allows a jobs to be marked as manual actions. Manual actions have to be explicitly executed by developers. ## What are the relevant issue numbers? This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010 See merge request !5297
| * | | Improve manual actions code and add model, service and feature testsKamil Trzcinski2016-07-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual actions are accessible from: - Pipelines - Builds - Environments - Deployments
View Lorry Controller Status