b413785e1d
[skip ci] Replace .pull-right with .float-right
2018-04-09 12:42:45 -05:00
aa4942a213
Merge branch 'master' into 'bootstrap4'
...
# Conflicts:
# app/helpers/issuables_helper.rb
# app/views/projects/_home_panel.html.haml
# app/views/projects/commits/_commit.html.haml
2018-04-09 17:04:05 +00:00
917b7e0dd9
Rename .btn-default to .btn-secondary
2018-04-09 11:49:18 -05:00
31dd86b636
Projects and groups badges settings UI
2018-04-08 10:20:05 +00:00
ca35c65b02
Fix form javascript
2018-04-06 21:20:17 -05:00
db18993f65
Create barebones for Deploytoken
...
Includes:
- Model, factories, create service and controller actions
- As usual, includes specs for everything
- Builds UI (copy from PAT)
- Add revoke action
Closes #31591
2018-04-06 21:20:16 -05:00
ad7148d9ea
Allow assigning and filtering issuables by ancestor group labels
2018-04-04 15:40:29 +00:00
2a9a15266d
Fix middle alignment for the title
2018-03-28 14:18:09 -05:00
1f02673867
Fix promoting labels and milestones copy text
2018-03-28 14:18:09 -05:00
5ad7378fc7
Change ci/lint page to use a template structure
...
- Removes duplicated CSS
- Includes translations for strings
2018-03-26 17:03:12 -06:00
80f9aff34b
Make ci/lint page context aware:
...
- Create ci/lints controller inside project/
- Move js pages to be inside projects/
- Copy view ci/lint view to be inside project folder
- Remove ci/lint view and js files
Closes #43603
2018-03-26 17:03:11 -06:00
e4587cf0e6
Move UI of several application settings to expandable block
...
To make design consistent with project settings
Next admin area application settings are afected by this commit:
* Visibility and access control
* Account and limit settings
* Sign in
* Sign up
* Help page
* Pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-26 15:10:56 +03:00
07487628f4
Rename modal.vue to deprecated_modal.vue
2018-03-22 10:48:17 +01:00
1fff345e0d
move confirm_danger_modal bindings directly into the only two pages that need it
2018-03-20 10:50:26 -05:00
78a8a79b01
Fix dropzone project show
2018-03-18 15:28:04 +00:00
1c74f5595f
Fixed profile notifications not being editable
...
Closes #44198
2018-03-16 16:51:03 +00:00
3e20b83b8b
Merge branch 'jivl-realtime-update-adding-file' into 'master'
...
Add realtime pipeline status component for files
Closes #42927
See merge request gitlab-org/gitlab-ce!17705
2018-03-15 17:16:59 +00:00
52c79bc8b3
Add realtime pipeline status component for files
2018-03-14 13:31:32 -06:00
4d1d3834fd
Change path of CI lints create index.js file
...
When the route action is create it defaults to new, this saves us having multiple files for the same route
Closes #44181
2018-03-14 16:50:19 +00:00
f248be7257
require jQuery to be explicitly imported
2018-03-09 15:18:09 -06:00
ce819eceea
Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'
...
Resolve: Modal and banner designs for project label and project milestone promotion
Closes #41895
See merge request gitlab-org/gitlab-ce!17197
2018-03-07 16:43:29 +00:00
a16547e5c2
used respond_to formats for persisting flash messages instead
2018-03-06 16:32:26 -06:00
2d00d6d459
Merge branch 'cluster-monitoring-changes-ce-backport' into 'master'
...
Cluster monitoring changes CE backport
See merge request gitlab-org/gitlab-ce!17547
2018-03-06 18:13:33 +00:00
e77c4e9efe
Merge branch 'master' into 'issue_38337'
...
# Conflicts:
# app/models/group.rb
# db/schema.rb
2018-03-06 16:28:54 +00:00
ed993603de
move misplaced entry point
2018-03-06 09:19:33 -06:00
e3251a4077
Changes after review
2018-03-05 18:40:04 +00:00
64857a9bf3
Manage empty states in Pipelines page
...
Adds i18n
Adds test
Fix broken tests
Fixes empty tab state for external CI
2018-03-05 11:22:50 +00:00
dd071c4b6e
Bring one group board to CE
2018-03-03 12:56:17 -03:00
b342d2ae52
Remove mr_notes webpack bundle
2018-03-02 21:16:11 +00:00
ddad22c4c4
Merge branch 'terminal-bundle-refactor' into 'master'
...
Removed terminal webpack bundle tag
See merge request gitlab-org/gitlab-ce!17494
2018-03-02 19:59:45 +00:00
c9660b45b1
Merge branch 'kp-add-query-param-support-search-token-endpoint' into 'master'
...
Add support for query params for labels endpoint
See merge request gitlab-org/gitlab-ce!17477
2018-03-02 19:09:43 +00:00
8510fc8701
Removed terminal webpack bundle tag
2018-03-02 20:04:55 +01:00
ca430d246d
Add `isGroupDecendent` to init config
2018-03-02 23:29:41 +05:30
29356cfee1
Merge branch 'two_factor_auth_webpack_bundle_tag_refactor' into 'master'
...
Removes webpack bundle tag for two factor auth js
See merge request gitlab-org/gitlab-ce!17330
2018-03-02 16:28:43 +00:00
834f4de181
Remove protected branches webpack bundle tag
2018-03-02 16:28:26 +00:00
617a8e2a3a
remove two_factor_auth bundle
2018-03-01 23:27:47 -06:00
9f23532c8b
Remove registry list webpack entry point
2018-03-01 23:44:10 +00:00
77346c1955
Remove trailing newline that was causing an EE conflict
2018-03-01 23:27:31 +00:00
f42397d19a
Add persistent flash messages
2018-03-01 16:10:04 -06:00
84e01b3e7a
Changed selector names, address code concerns
2018-03-01 16:10:04 -06:00
d5c0018649
Added vue based promotion modals for labels and milestones
2018-03-01 16:10:03 -06:00
bac9bb1866
Merge branch 'ee-3727-epic-labels-backport' into 'master'
...
CE Platform port for EE epics filtered search changes
See merge request gitlab-org/gitlab-ce!17445
2018-03-01 09:45:33 +00:00
0c9d4a1637
init sidebar bundle separately to allow EE override
2018-03-01 09:41:25 +00:00
730d7dda3e
Update FilteredSearchManager init config
2018-03-01 13:03:41 +05:30
ec2e54b363
Merge branch 'protected-tags-bundle-refactor' into 'master'
...
Removed protected_tags webpack bundle
See merge request gitlab-org/gitlab-ce!17334
2018-03-01 00:24:02 +00:00
b507564017
Merge branch 'pipelines_show_refactor' into 'master'
...
Refactor pipelines show for webpack bundle tag removal
See merge request gitlab-org/gitlab-ce!17127
2018-02-28 21:53:35 +00:00
aae4d8b014
Remove webpack bundle tag for enviroments
2018-02-28 20:26:12 +00:00
9353c5c780
Merge branch 'master' into 'pipelines_show_refactor'
...
# Conflicts:
# config/webpack.config.js
2018-02-28 18:40:06 +00:00
a9db24b2be
Remove cycle analytics bundle webpack entry point
2018-02-28 17:13:46 +00:00
4f83906793
Move the remaining EE-specific JS files to ee/
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-28 12:05:25 +01:00
Clement Ho
Francisco Javier López
Kamil Trzciński
Mayra Cabrera
Felipe Artur
Jose Ivan Vargas
Dmitriy Zaporozhets
Winnie Hellmann
Mike Greiling
Phil Hughes
Filipa Lacerda
Felipe Artur
Jacob Schatz
Kushal Pandya
Constance Okoghenun
Kushal Pandya
Stan Hu
Simon Knox
Rémy Coutable