0151325dac
Merge request widget redesign
2017-05-09 04:15:34 +00:00
f7cf2a7be6
Merge branch 'revert-58d1cd6b' into 'master'
...
Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'"
See merge request !11153
2017-05-07 22:36:55 +00:00
8df3997a92
Add Pipeline Schedules that supersedes experimental Trigger Schedule
2017-05-07 22:35:56 +00:00
e08130223c
Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'"
...
This reverts merge request !11150
2017-05-07 22:35:20 +00:00
58d1cd6beb
Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'
...
Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection call …
See merge request !11150
2017-05-07 22:05:15 +00:00
e6f008bb84
Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection call of rspec_profiling.rb
2017-05-07 15:34:27 +00:00
aa440eb1c0
Single commit squash of all changes for 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.
2017-05-06 19:04:48 +02:00
61d0ac55d4
Use an absolute path for locale path in FastGettext config
...
Unicorn was unable to start due to this bad config on Omnibus.
2017-05-05 20:50:48 -05:00
143d88d5e6
Merge branch 'fix/admin-integrations' into 'master'
...
Fix new admin integrations not taking effect on existing project
Closes #26376
See merge request !11069
2017-05-05 22:01:43 +00:00
aa874a1cd6
Merge branch 'mia_backort' into 'master'
...
Backport of Multiple Assignees feature
See merge request !11089
2017-05-05 19:17:28 +00:00
9caa7e7a54
Merge branch '24883-build-failure-summary-page' into 'master'
...
Build failures summary page for pipelines
Closes #24883
See merge request !10719
2017-05-05 18:58:01 +00:00
ecaa68a709
Merge branch 'balsalmiq-support' into 'master'
...
Initial balsamiq support
See merge request !10564
2017-05-05 18:43:13 +00:00
b815353510
Merge branch 'add-sentry-js-again-with-vue' into 'master'
...
Add sentry JS
See merge request !6764
2017-05-05 17:51:38 +00:00
6ecf16b8f7
refactor code based on feedback
2017-05-05 18:01:33 +02:00
40f51c8e81
[skip ci] Fix FE conflicts with master
2017-05-05 09:19:58 -05:00
4c0adb9ee9
Build failures summary page for pipelines
2017-05-05 15:01:50 +01:00
5004579b15
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip]
2017-05-05 16:59:31 +03:00
faf2ce89cd
Merge branch 'mrchrisw-import-shell-timeout'
2017-05-05 14:40:52 +01:00
7fd42698aa
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
...
Conflicts:
lib/gitlab/cycle_analytics/review_stage.rb
lib/gitlab/cycle_analytics/staging_stage.rb
lib/gitlab/cycle_analytics/test_stage.rb
2017-05-04 18:51:18 -05:00
b396668ec5
Add CHANGELOG entry, some specs and locale file for German.
2017-05-04 18:44:19 -05:00
12fbce2eac
Merge branch 'master' into 'add-sentry-js-again-with-vue'
...
# Conflicts:
# db/schema.rb
2017-05-04 22:48:21 +00:00
f7b7a52092
More updates for translations plus small tweaks.
2017-05-04 17:05:14 -05:00
7a66cd688a
Merge branch 'deploy-keys-load-async' into 'master'
...
Deploy keys load async
Closes #29667
See merge request !10973
2017-05-04 18:30:41 +00:00
dac3b6a416
Review changes, removed api/v3 updates as its frozen, removed the clientside_sentry properties from the sensitive data filter as they\'re both available publically
2017-05-04 17:21:27 +01:00
dde9b6698b
Fix webpack config conflict
2017-05-04 10:08:55 -05:00
d3768dd796
Merge branch 'dm-artifact-blob-viewer' into 'master'
...
Use blob viewer for job artifacts
Closes #31297
See merge request !11018
2017-05-04 15:01:54 +00:00
9904c12746
Updated webpack config
2017-05-04 15:57:08 +01:00
79f40f27fd
Merge branch 'master' into deploy-keys-load-async
2017-05-04 15:54:16 +01:00
387c4b2c21
Backport of multiple_assignees_feature [ci skip]
2017-05-04 17:11:53 +03:00
0f58eb6bde
Add artifact file page that uses the blob viewer
2017-05-04 08:50:12 -05:00
ba608dc0f2
Merge branch '12910-uploader-pers-snippet' into 'master'
...
Prepare uploaders for personal snippets comments
See merge request !11022
2017-05-04 10:47:10 +00:00
d34f676414
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
2017-05-04 11:21:40 +01:00
2f7f1ce4e6
fix sidekiq spec, add changelog
2017-05-04 11:32:39 +02:00
b64a37c4ed
Allow to create new branch and empty WIP merge request from issue page
2017-05-04 08:09:21 +00:00
628d641b06
Disable FastGettext from translating AR attrs.
...
It isn't working fine when using POROs in forms like WikiPage,
the following error is being raised: undefined method `abstract_class?' for Object:Class
2017-05-04 01:58:57 -05:00
f29e5d4d93
Merge branch 'master' into deploy-keys-load-async
2017-05-03 17:04:47 +01:00
c45e11f179
Merge branch 'async-milestone-tabs' into 'master'
...
Load milestone tabs asynchronously
See merge request !10919
2017-05-03 15:15:20 +00:00
7788118c3d
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
2017-05-03 13:03:57 +01:00
6d5364cfb0
First round of updates from the code review.
2017-05-02 23:36:36 -05:00
bbfbcebdf6
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
2017-05-02 13:20:41 -05:00
3b82444eb7
Fix Rubocop complains.
2017-05-02 13:14:11 -05:00
920d55b9f8
Merge branch 'remove-unused-initializer' into 'master'
...
Remove unused initializer
See merge request !11036
2017-05-02 18:01:32 +00:00
d048d9268c
Merge branch 'metrics-deployment-history' into 'master'
...
Metrics deployment history
Closes #26914
See merge request !10649
2017-05-02 16:56:49 +00:00
e27c720a2a
Merge remote-tracking branch 'origin/master' into balsalmiq-support
2017-05-02 17:01:02 +01:00
c5dee301f8
Merge branch 'dm-snippet-download-button' into 'master'
...
Add download button to project snippets
See merge request !11004
2017-05-02 15:25:26 +00:00
d32ecb23eb
Merge branch '12910-personal-snippets-notes-show' into 'master'
...
Display comments for personal snippets
See merge request !10974
2017-05-02 14:38:28 +00:00
44e3b0080e
Remove unused initializer
...
We don't appear to have an `active_record_query_trace` dependency any more.
2017-05-02 15:32:15 +01:00
43ff738641
Support uploaders for personal snippets comments
2017-05-02 15:22:24 +02:00
aaf37ead92
Merge branch '19364-webhook-edit' into 'master'
...
Implement ability to update hooks
Closes #19364
See merge request !10816
2017-05-02 11:44:58 +00:00
8c3a03c1b9
Display comments for personal snippets
2017-05-02 13:07:53 +02:00
Fatih Acet
Stan Hu
Zeger-Jan van de Weg
Luke "Jared" Bennett
Kamil Trzcinski
Ruben Davila
Sean McGivern
Jacob Schatz
Phil Hughes
James Lopez
Clement Ho
James Edwards-Jones
Valery Sizov
Sean McGivern
Filipa Lacerda
Douwe Maan
Alfredo Sumaran
Douwe Maan
Jarka Kadlecova
Dmitriy Zaporozhets