Dmitriy Zaporozhets
247385a702
Merge branch 'fix-removed-file-in-diff' into 'master'
...
Fix bug when removed file was not appearing in merge request diff
Finally we can see removed files in merge request diff ✨
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Fixes #2533
See merge request !1471
2015-09-30 15:41:22 +00:00
Dmitriy Zaporozhets
fe7e97320c
Fix bug when removed file was not appearing in merge request diff
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-30 12:31:23 +02:00
Dmitriy Zaporozhets
3d9a7cdb4b
Refactor CI helpers
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-29 16:26:40 +02:00
Dmitriy Zaporozhets
87240e989b
Move CI project settings page to CE project settings area
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-29 16:07:44 +02:00
Douwe Maan
231ee19c81
Merge branch 'krb_auth_helper_ce' into 'master'
...
Remove 'kerberos' from auth_helper.rb for gitlab-CE.
There is no Kerberos auth in gitlab-ce, so it shouldn't be noted
as a form-driven auth mechanism in app/helpers/auth_helper.rb.
This breaks using Kerberos as a custom omniauth provider.
See issue #2510 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510 ).
@DouweM suggested I send in this merge request.
See merge request !1430
2015-09-29 07:27:08 +00:00
Dmitriy Zaporozhets
b656419591
Merge branch 'move-runners-page'
2015-09-28 16:47:18 +02:00
Stan Hu
0383afc66a
Add user preference to view project activity and starred project activity as default dashboard
...
Closes #2662
2015-09-26 08:46:05 -07:00
Dmitriy Zaporozhets
b328c76c06
Move runners page to project settings
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-25 18:03:41 +02:00
Ben Rosser
7d2655aae7
Remove 'kerberos' from auth_helper.rb for gitlab-CE.
...
There is no Kerberos auth in gitlab-ce, so it shouldn't be noted
as a form-driven auth mechanism in app/helpers/auth_helper.rb.
This breaks using Kerberos as a custom omniauth provider.
See issue #2510
2015-09-24 13:52:20 -04:00
Dmitriy Zaporozhets
fd39414408
Merge branch 'remove-routes-helper' into 'master'
...
Fix Slack notification URL and remove the usage of Ci::RoutesHelper
Fix for #2644
/cc @dzaporozhets @rspeicher
See merge request !1391
2015-09-24 09:53:04 +00:00
Douwe Maan
ae3fba6cfa
Merge branch 'rs-help-page' into 'master'
...
Help page improvements
- Only signed-in users can see version information
- Add "Community Edition" text so the header is
less barren when version information is hidden
- Minor copy edits
- Make all "Quick help" link text the entire body
of the link. Prior, it wasn't obvious which part
of each item was an actual link.
Closes #2721
See merge request !1415
2015-09-24 07:51:52 +00:00
Douwe Maan
4bf1e85cce
Merge branch 'fix-network-graph-refs' into 'master'
...
Remove git refs used internally by GitLab from network graph
GitLab 8.0 removed satellites and started using git refs that began with `refs/merge-requests/XXX` and `refs/tmp/XXX`, which showed up in an ugly way in the network graph:
Closes #2702
See merge request !1410
2015-09-24 07:43:53 +00:00
Robert Speicher
be142e6bd6
Move the version_check_enabled check from view to helper
2015-09-23 16:28:51 -04:00
Robert Speicher
0175769aa8
Merge branch 'fix-markdown-truncation-removing-links' into 'master'
...
Fix cases where Markdown did not render links in activity feed
HTML would be stripped in `truncate_if_block` when a comment had multiple lines
and the first wasn't long enough to be truncated. The use of `node.content` would
strip all HTML tags. Using `node.inner_html` retains these tags and puts the
"..." in between paragraph tags.
Closes #2586
See merge request !1401
2015-09-23 17:20:37 +00:00
Stan Hu
150fb81ef9
Remove git refs used internally by GitLab from network graph
...
Closes #2702
2015-09-23 08:56:32 -07:00
Dmitriy Zaporozhets
21dfaa000d
Show CI status on all pages where commits list is rendered
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-23 12:23:04 +02:00
Stan Hu
a7b0ee3fd1
Fix cases where Markdown did not render links in activity feed
...
HTML would be stripped in `truncate_if_block` when a comment had multiple lines
and the first wasn't long enough to be truncated. The use of `node.content` would
strip all HTML tags. Using `node.inner_html` retains these tags and puts the
"..." in between paragraph tags.
Closes #2586
2015-09-22 21:56:27 -07:00
Kamil Trzcinski
dabbee65d4
Fix Slack notification URL and remove the usage of Ci::RoutesHelper
2015-09-22 16:09:14 +02:00
Douwe Maan
a9d686b2fb
Link project repo size to files
2015-09-21 14:57:33 +02:00
Douwe Maan
183892fde9
Merge branch 'notification-levels' into 'master'
...
Notification levels can now be set on the Project's main page
The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.
Saving is done via a remote form submission and if successful shows the user a flash message:
@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.
@rspeicher hopefully we can include it with the 8.0 release, maybe?
/cc @darby
See merge request !1322
2015-09-21 09:19:32 +00:00
Douwe Maan
46173ec8ce
Merge branch 'fix-markdown-links-in-dashboard' into 'master'
...
Fix Markdown links not showing up in dashboard activity feed
Closes #2586
See merge request !1353
2015-09-21 07:24:19 +00:00
Douwe Maan
47e926bec0
Minor code cleanup
2015-09-20 19:09:43 +02:00
Stan Hu
3b39b648d2
Fix Markdown links not showing up in dashboard activity feed
...
Closes #2586
2015-09-20 09:32:35 -07:00
Dmitriy Zaporozhets
4daffbe406
Cleanup GitLab CI UI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-19 01:40:44 +02:00
Dmitriy Zaporozhets
2122d7b919
Merge branch 'master' into ci-build-list
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-18 18:24:08 +02:00
Douwe Maan
5faa6e75d0
Merge branch 'master' into project-header-titles
2015-09-18 10:48:06 +02:00
Dmitriy Zaporozhets
e86668984f
Style CI project/build list
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-18 09:44:10 +02:00
Kamil Trzcinski
d059d34622
Remove duplicate code
2015-09-17 14:22:56 +02:00
Kamil Trzcinski
e7bca1c853
Check current_controller against controller_path
...
The controller_path includes namespaces, where controller_name only includes the class name without controller
2015-09-17 14:22:43 +02:00
Douwe Maan
d89ae7df2c
Move project header title definition to view in question.
2015-09-17 12:16:24 +02:00
Stan Hu
f481637245
Merge branch 'fix-issue-2382' into 'master'
...
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity
Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".
Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:
Closes #2382
See merge request !1227
2015-09-17 08:04:37 +00:00
Patricio Cano
1ddefa3bea
Merge branch 'master' into notification-levels
2015-09-16 19:54:18 -05:00
Patricio Cano
1ef2ce95d5
Merge branch 'master' into notification-levels
2015-09-16 19:52:57 -05:00
Patricio Cano
4c98357f16
Added Global to the drop downs and updated the label of the button to show the current level instead of Notifications
2015-09-16 19:46:24 -05:00
Stan Hu
1dc04bf6b7
Eliminate combined image_tag and image_path in providers list
2015-09-16 11:04:09 -07:00
Stan Hu
71cdb24990
Fix default avatars to ensure that helpers don't have /assets dir appended
2015-09-16 10:52:23 -07:00
Kamil Trzcinski
e21deaee8e
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
# Conflicts:
# Gemfile.lock
2015-09-15 22:40:35 +02:00
Stan Hu
d3d03d1362
Create a "destroyed Milestone" event and keep Milestone events around in the DB
...
for posterity.
Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".
Add "in" preposition when creating and destroying milestones
Closes #2382
2015-09-15 05:51:11 -07:00
Patricio Cano
01cc20378b
Notification dropdown now shows currently active level, and also shows what the actual value of global is, if the project has the notification level set to global.
2015-09-14 20:33:24 -05:00
Patricio Cano
8a6fb46dff
Corrected case indentation to conform with Rubocop
2015-09-14 19:40:45 -05:00
Patricio Cano
dd2ffafea4
Added spacing to icons in Notification drop down
2015-09-14 19:30:58 -05:00
Patricio Cano
adcae6ebd5
Notification level can now be saved from within the project view.
2015-09-14 19:27:54 -05:00
Patricio Cano
ab56718feb
Fixed notification level list item helper.
2015-09-14 18:40:47 -05:00
Darby
84508c40b7
PAtrially working notification button
2015-09-14 16:37:11 -07:00
Dmitriy Zaporozhets
ebd06d7e7d
Make small ui fixes for CI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-14 21:00:06 +02:00
Dmitriy Zaporozhets
b5c681c0c9
Add current_ref helper method
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-14 20:23:01 +02:00
Dmitriy Zaporozhets
0c8f07774c
Add page titles to header for group and project
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-14 19:46:58 +02:00
Drew Blessing
539f30ddcf
Fix tooltip display in list views
2015-09-14 08:45:16 -05:00
Kamil Trzcinski
1ce85dc4e2
Fix navigation and header tile
...
Remove redundant navigation on commits and builds page
2015-09-14 14:03:02 +02:00
Kamil Trzcinski
81560ab259
Fix build triggers URL and slack notifications
2015-09-14 14:01:17 +02:00
Dmitriy Zaporozhets
Douwe Maan
Stan Hu
Ben Rosser
Robert Speicher
Robert Speicher
Kamil Trzcinski
Patricio Cano
Darby
Drew Blessing
