| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Added balsamiq jasmine integration test | Luke "Jared" Bennett | 2017-05-15 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'use-common-vue-for-pipeline-schedule-bundles' into 'master' | Filipa Lacerda | 2017-05-14 | 1 | -1/+3 |
| |\ | | | | | | | | | Ensure schedule_form and schedules_index both utilize common_vue bundle See merge request !11274 | ||||
| | * | ensure schedule_form and schedules_index both utilize common_vue bundleuse-common-vue-for-pipeline-schedule-bundles | Mike Greiling | 2017-05-12 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'disable-usage-ping' into 'master' | Robert Speicher | 2017-05-12 | 1 | -0/+1 |
| |\ \ | |/ |/| | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231 | ||||
| | * | Allow disabling usage ping in `gitlab.yml` | Sean McGivern | 2017-05-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | Setting `usage_ping_enabled` to false in `gitlab.yml`: 1. Disables the usage ping, regardless of the value stored in the database. 2. Prevents the usage ping from being enabled through the admin panel. It can only be enabled by either removing the line from `gitlab.yml` and configuring through the admin panel, or setting it to true in `gitlab.yml`. | ||||
| * | | Merge branch 'remove-balsamiq-module-from-common_vue-bundle' into 'master' | Filipa Lacerda | 2017-05-11 | 1 | -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-bundle | Luke "Jared" Bennett | 2017-05-10 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge branch 'use-common-vue-for-filtered-search' into 'master' | Clement Ho | 2017-05-11 | 1 | -0/+1 |
| |\ \ \ | |_|/ |/| | | | | | | | | Ensure filtered_search utilizes common_vue bundle See merge request !11273 | ||||
| | * | | ensure filtered_search utilizes common_vue bundleuse-common-vue-for-filtered-search | Mike Greiling | 2017-05-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵ | Robert Speicher | 2017-05-10 | 3 | -6/+6 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063 | ||||
| | * | | Enable the Style/TrailingCommaInArguments cop | Rémy Coutable | 2017-05-10 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Enable the Style/TrailingCommaInLiteral cop | Rémy Coutable | 2017-05-10 | 1 | -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 Maan | 2017-05-10 | 1 | -0/+1 |
| |\ \ | |/ |/| | | | | | | | | | Post-deploy to clean `pending_delete` projects Closes #20984 See merge request !11044 | ||||
| | * | Use worker to destroy namespaceless projects in post-deploy | Toon Claes | 2017-05-10 | 1 | -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 avatars | blackst0ne | 2017-05-10 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'fix/gb/remove-ci-models-from-eager-load-paths' into 'master' | Rémy Coutable | 2017-05-09 | 1 | -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 Bizon | 2017-05-09 | 1 | -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 redesign | Fatih Acet | 2017-05-09 | 2 | -4/+7 |
| |/ | |||||
| * | Merge branch 'revert-58d1cd6b' into 'master' | Stan Hu | 2017-05-07 | 1 | -1/+1 |
| |\ | | | | | | | | | Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" See merge request !11153 | ||||
| | * | Revert "Merge branch ↵revert-58d1cd6b | Stan Hu | 2017-05-07 | 1 | -1/+1 |
| | | | | | | | | | | | 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" This reverts merge request !11150 | ||||
| * | | Add Pipeline Schedules that supersedes experimental Trigger Schedule | Zeger-Jan van de Weg | 2017-05-07 | 4 | -4/+12 |
| |/ | |||||
| * | Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' ↵ | Stan Hu | 2017-05-07 | 1 | -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-deprecation | Luke "Jared" Bennett | 2017-05-07 | 1 | -1/+1 |
| | | | | | | | | | call of rspec_profiling.rb | ||||
| * | | Single commit squash of all changes for ↵ | Kamil Trzcinski | 2017-05-06 | 1 | -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-config | Ruben Davila | 2017-05-05 | 1 | -1/+1 |
| | | | | | Unicorn was unable to start due to this bad config on Omnibus. | ||||
| * | Merge branch 'fix/admin-integrations' into 'master' | Sean McGivern | 2017-05-05 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Fix new admin integrations not taking effect on existing project Closes #26376 See merge request !11069 | ||||
| | * | refactor code based on feedback | James Lopez | 2017-05-05 | 1 | -1/+1 |
| | | | |||||
| | * | fix sidekiq spec, add changelog | James Lopez | 2017-05-04 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'mia_backort' into 'master' | Jacob Schatz | 2017-05-05 | 1 | -3/+2 |
| |\ \ | | | | | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089 | ||||
| | * | | [skip ci] Fix FE conflicts with master | Clement Ho | 2017-05-05 | 1 | -5/+0 |
| | | | | |||||
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵ | Valery Sizov | 2017-05-05 | 10 | -0/+522 |
| | |\ \ | | | | | | | | | | | | | skip] | ||||
| | * | | | Fix webpack config conflict | Clement Ho | 2017-05-04 | 1 | -5/+0 |
| | | | | | |||||
| | * | | | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Merge branch '24883-build-failure-summary-page' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build failures summary page for pipelines Closes #24883 See merge request !10719 | ||||
| | * | | | | Build failures summary page for pipelines | James Edwards-Jones | 2017-05-05 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'balsalmiq-support' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Initial balsamiq support See merge request !10564 | ||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' into balsalmiq-support | Luke "Jared" Bennett | 2017-05-02 | 3 | -6/+15 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-05-02 | 2 | -0/+7 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/features/projects/commit/cherry_pick_spec.rb # spec/features/projects/environments/environment_spec.rb | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into balsalmiq-support | Luke "Jared" Bennett | 2017-04-30 | 3 | -4/+8 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into balsalmiq-support | Luke "Jared" Bennett | 2017-04-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix webpack config conflicts bad resolution | Luke "Jared" Bennett | 2017-04-27 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into balsalmiq-support | Luke "Jared" Bennett | 2017-04-27 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-04-26 | 11 | -123/+133 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-04-12 | 2 | -4/+68 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/blob.rb | ||||
| | * | | | | | | | | | | | | Get initial sql values back from file which is database | Jacob Schatz | 2017-04-10 | 1 | -0/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Initial balsamiq support | Jacob Schatz | 2017-04-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sentry JS See merge request !6764 | ||||
| | * | | | | | | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-05-04 | 3 | -0/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | | | | | | | | | | | | Review changes, removed api/v3 updates as its frozen, removed the ↵ | Luke "Jared" Bennett | 2017-05-04 | 1 | -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-vue | Luke "Jared" Bennett | 2017-05-04 | 2 | -1/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |