0151325dac
Merge request widget redesign
2017-05-09 04:15:34 +00:00
8df3997a92
Add Pipeline Schedules that supersedes experimental Trigger Schedule
2017-05-07 22:35:56 +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
aa874a1cd6
Merge branch 'mia_backort' into 'master'
...
Backport of Multiple Assignees feature
See merge request !11089
2017-05-05 19:17:28 +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
40f51c8e81
[skip ci] Fix FE conflicts with master
2017-05-05 09:19:58 -05: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
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
12fbce2eac
Merge branch 'master' into 'add-sentry-js-again-with-vue'
...
# Conflicts:
# db/schema.rb
2017-05-04 22:48:21 +00:00
dde9b6698b
Fix webpack config conflict
2017-05-04 10:08:55 -05:00
9904c12746
Updated webpack config
2017-05-04 15:57:08 +01:00
387c4b2c21
Backport of multiple_assignees_feature [ci skip]
2017-05-04 17:11:53 +03:00
f29e5d4d93
Merge branch 'master' into deploy-keys-load-async
2017-05-03 17:04:47 +01:00
7788118c3d
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
2017-05-03 13:03:57 +01:00
bbfbcebdf6
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
2017-05-02 13:20:41 -05:00
ef7001c9c6
Merge branch 'master' into 'balsalmiq-support'
...
# Conflicts:
# spec/features/projects/commit/cherry_pick_spec.rb
# spec/features/projects/environments/environment_spec.rb
2017-05-02 09:11:55 +00:00
9f3985c613
Move PDFLab into GitLab
2017-04-28 12:52:36 -04:00
e11a702afc
Re-wrote to match our docs - still not 100% sure but closer than it was
2017-04-28 17:06:19 +01:00
f74d0ba195
Fix webpack config conflicts bad resolution
2017-04-27 17:58:51 +01:00
c3633db617
Merge branch 'master' into 'balsalmiq-support'
...
# Conflicts:
# config/webpack.config.js
2017-04-26 11:26:10 +00:00
ca6cc6014e
Merge branch 'master' into 'add-sentry-js-again-with-vue'
...
# Conflicts:
# config/webpack.config.js
2017-04-26 11:13:42 +00:00
dc5136a70d
Merge remote-tracking branch 'origin/28433-internationalise-cycle-analytics-page' into js-translations
2017-04-21 09:16:05 +01:00
086700fa5b
Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-page
...
Conflicts:
config/webpack.config.js
2017-04-20 15:31:15 -05:00
b7b5bd4a49
Merge remote-tracking branch 'origin/28433-internationalise-cycle-analytics-page' into js-translations
2017-04-20 14:15:39 +01:00
468ff9593a
Remove special naming of pipelines folder
2017-04-19 11:44:37 +00:00
a3506a2287
Fixed missing text
...
Fixed duplicated time in dropdown
2017-04-18 17:00:44 +01:00
7963c2c251
Added Vue filters & directives for translating
2017-04-18 14:55:09 +01:00
8918433af6
Issue Title Vue: convert to .vue - use 'render' with 'createElement' in index
2017-04-15 15:11:04 +00:00
90ba69d224
Started internationalising cycyle analytics
2017-04-15 16:07:31 +01:00
86b4f49c8c
Removed rewire and fixed tests
2017-04-15 12:34:13 +01:00
69e49a095d
Only rewire in dev
2017-04-15 12:00:33 +01:00
2f35ba98fa
Merge branch 'master' into 'add-sentry-js-again-with-vue'
...
# Conflicts:
# app/views/layouts/_head.html.haml
# config/webpack.config.js
2017-04-15 02:46:55 +00:00
e22bd9650d
Updated specs, added rewire, updated layouts to move conditional raven and gon to head
2017-04-15 03:38:59 +01:00
cfd3d0fd37
[ci skip] Remove loadscript class in favour of backend conditional
2017-04-13 17:18:15 +01:00
10deca824e
Improve webpack-dev-server compatibility with non-localhost setups.
2017-04-12 19:05:23 +00:00
6d2db33de4
Merge branch 'master' into 'balsalmiq-support'
...
# Conflicts:
# app/models/blob.rb
2017-04-12 08:46:45 +00:00
3812abfa23
watch node_modules for changes when a module is missing
2017-04-10 14:44:53 -05:00
ef07200cd0
Get initial sql values back from file which is database
2017-04-10 14:56:43 +01:00
acea881bb0
Initial balsamiq support
2017-04-10 14:56:43 +01:00
0ca62a680c
clean up webpack config
2017-04-09 15:22:53 -05:00
6c547e3142
add vue-loader dependencies and basic config
2017-04-09 15:22:53 -05:00
d0beb755f9
Add a name field to the group edit form
...
Enables user specification of group name vs. name inferred from group path.
Cause new group form to copy name from path
Adds some new page-specific javascript that copies entry from the
group path field to the group name field when the group name field
is initially empty.
Remove duplicate group name entry field on group edit form
This corrects the duplicated name entry field and tests that the
JavaScript does not update the group name field if the user
edits the group path. (Editing the group path is not recommended
in any case, but it is possible.)
Address eslint errors in group.js
Enable group name copy with dispatch and explore group creation
The dispatch and explore group creation forms require the group.js
asset, and their tests now require testing against poltergeist
Update workflow new group instruction
Update the gitlab basics group creation document
Add a change log entry
Remove unused variable for eslint
2017-04-09 08:43:49 -05:00
55811ac990
Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags
2017-04-06 21:35:01 +01:00
e992799ce5
STL file viewer
2017-04-06 10:02:24 +00:00
18506d4b8b
Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'
...
# Conflicts:
# app/assets/javascripts/dispatcher.js
# app/assets/stylesheets/pages/projects.scss
2017-04-06 09:46:50 +00:00
3c414a9fa9
Update bundle path for Protected Tags bundle
2017-04-06 14:18:17 +05:30
1c783007e6
Issue title realtime
2017-04-06 01:13:06 +00:00
dad30d6bbf
Use PDFLab to render PDFs in GitLab
2017-04-05 11:22:12 -04:00
fd8a40783d
Load a preview of Sketch 43 files
...
Sketch 43 files are technically a zip file, so the JavaScript opens the
zip file & locates a preview.png which is just a quick preview of the
last sketch page edited. After that is loaded it simply places the image
into the DOM
2017-04-05 11:49:08 +01:00
Fatih Acet
Zeger-Jan van de Weg
Kamil Trzcinski
Jacob Schatz
Phil Hughes
Clement Ho
Valery Sizov
Ruben Davila
Luke "Jared" Bennett
Sam Rose
Filipa Lacerda
Regis Boudinot
Mike Greiling
Mike Greiling
Jacob Schatz
Douglas Lovell
James Edwards-Jones
Kushal Pandya
Kushal Pandya