summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-balsamiq-module-from-common_vue-bundle' into 'master' Filipa Lacerda2017-05-111-1/+0
|\ | | | | | | | | | | | | Remove balsamiq module from common_vue bundle Closes #32092 See merge request !11248
| * Remove balsamiq module from common_vue bundleremove-balsamiq-module-from-common_vue-bundleLuke "Jared" Bennett2017-05-101-1/+0
| |
* | Merge branch 'use-common-vue-for-filtered-search' into 'master' Clement Ho2017-05-111-0/+1
|\ \ | | | | | | | | | | | | Ensure filtered_search utilizes common_vue bundle See merge request !11273
| * | ensure filtered_search utilizes common_vue bundleuse-common-vue-for-filtered-searchMike Greiling2017-05-101-0/+1
| | |
* | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵Robert Speicher2017-05-103-6/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
| * | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-103-5/+5
| | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-1/+1
| |/ | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'tc-clean-pending-delete-projects' into 'master' Douwe Maan2017-05-101-0/+1
|\ \ | |/ |/| | | | | | | | | Post-deploy to clean `pending_delete` projects Closes #20984 See merge request !11044
| * Use worker to destroy namespaceless projects in post-deployToon Claes2017-05-101-0/+1
| | | | | | | | | | | | | | | | Destroying projects can be very time consuming. So instead of destroying them in the post-deploy, just schedule them and make Sidekiq do the hard work. They are scheduled in batches of 5000 records. This way the number of database requests is limited while also the amount data read to memory is limited.
* | Use relative paths for group/project/user avatarsblackst0ne2017-05-101-1/+1
|/
* Merge branch 'fix/gb/remove-ci-models-from-eager-load-paths' into 'master' Rémy Coutable2017-05-091-1/+0
|\ | | | | | | | | | | | | Remove CI/CD models directory from `eager_load_paths` Closes #31841 See merge request !11129
| * Remove CI/CD models directory from `eager_load_paths`Grzegorz Bizon2017-05-091-1/+0
| | | | | | | | | | | | | | CI/CD models are already located inside `CI` module, thus usual Rails autoloading principles apply. See https://github.com/rails/rails/issues/28854 for more details.
* | Merge request widget redesignFatih Acet2017-05-092-4/+7
|/
* Merge branch 'revert-58d1cd6b' into 'master' Stan Hu2017-05-071-1/+1
|\ | | | | | | | | Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" See merge request !11153
| * Revert "Merge branch ↵revert-58d1cd6bStan Hu2017-05-071-1/+1
| | | | | | | | | | 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" This reverts merge request !11150
* | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-074-4/+12
|/
* Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' ↵Stan Hu2017-05-071-1/+1
|\ | | | | | | | | | | | | | | into 'master' Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection call … See merge request !11150
| * Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection ↵fix-rspec_profiling-establish_connection-string-deprecationLuke "Jared" Bennett2017-05-071-1/+1
| | | | | | | | call of rspec_profiling.rb
* | Single commit squash of all changes for ↵Kamil Trzcinski2017-05-061-0/+2
|/ | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878 It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
* Use an absolute path for locale path in FastGettext configuse-absolute-path-for-gettext-configRuben Davila2017-05-051-1/+1
| | | | Unicorn was unable to start due to this bad config on Omnibus.
* Merge branch 'fix/admin-integrations' into 'master' Sean McGivern2017-05-051-0/+1
|\ | | | | | | | | | | | | Fix new admin integrations not taking effect on existing project Closes #26376 See merge request !11069
| * refactor code based on feedbackJames Lopez2017-05-051-1/+1
| |
| * fix sidekiq spec, add changelogJames Lopez2017-05-041-0/+1
| |
* | Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-051-3/+2
|\ \ | | | | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089
| * | [skip ci] Fix FE conflicts with masterClement Ho2017-05-051-5/+0
| | |
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵Valery Sizov2017-05-0510-0/+522
| |\ \ | | | | | | | | | | | | skip]
| * | | Fix webpack config conflictClement Ho2017-05-041-5/+0
| | | |
| * | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-1/+6
| | | |
* | | | Merge branch '24883-build-failure-summary-page' into 'master' Phil Hughes2017-05-051-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build failures summary page for pipelines Closes #24883 See merge request !10719
| * | | | Build failures summary page for pipelinesJames Edwards-Jones2017-05-051-0/+1
| | | | |
* | | | | Merge branch 'balsalmiq-support' into 'master' Phil Hughes2017-05-051-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Initial balsamiq support See merge request !10564
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into balsalmiq-supportLuke "Jared" Bennett2017-05-023-6/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-05-022-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/features/projects/commit/cherry_pick_spec.rb # spec/features/projects/environments/environment_spec.rb
| * \ \ \ \ \ \ Merge branch 'master' into balsalmiq-supportLuke "Jared" Bennett2017-04-303-4/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into balsalmiq-supportLuke "Jared" Bennett2017-04-281-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix webpack config conflicts bad resolutionLuke "Jared" Bennett2017-04-271-0/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into balsalmiq-supportLuke "Jared" Bennett2017-04-271-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-04-2611-123/+133
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-04-122-4/+68
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/blob.rb
| * | | | | | | | | | | | Get initial sql values back from file which is databaseJacob Schatz2017-04-101-0/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Initial balsamiq supportJacob Schatz2017-04-101-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes2017-05-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sentry JS See merge request !6764
| * | | | | | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-05-043-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | | | Review changes, removed api/v3 updates as its frozen, removed the ↵Luke "Jared" Bennett2017-05-041-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clientside_sentry properties from the sensitive data filter as they\'re both available publically
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-042-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-037-15/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-282-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-282-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed specsLuke "Jared" Bennett2017-04-281-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Attempted adding separate clientside_sentry settingsLuke "Jared" Bennett2017-04-281-0/+2
| | | | | | | | | | | | | | |
View Lorry Controller Status