gitlab-org--gitlab-foss/app/views
Grzegorz Bizon 3deaf1342e Merge branch 'master' into auto-pipelines-vue
* master: (367 commits)
  Set “Remove branch” button to default size
  remove unused helper method
  reduce common code even further to satisfy rake flay
  remove button class size alteration from revert and cherry pick links
  factor out common code to satisfy rake flay
  homogenize revert and cherry-pick button styles generated by commits_helper
  apply margin on alert banners only when there is one or more alerts
  Rename MattermostNotificationService back to MattermostService
  Rename SlackNotificationService back to SlackService
  Fix stage and pipeline specs and rubocop offenses
  Added QueryRecorder to test N+1 fix on Milestone#show
  Use gitlab-workhorse 1.2.1
  Make 'unmarked as WIP' message more consistent
  Improve specs for Files API
  Allow unauthenticated access to Repositories Files API GET endpoints
  Add isolated view spec for pipeline stage partial
  Move test for HTML stage endpoint to controller specs
  Fix sizing of avatar circles; add border
  Fix broken test
  Fix broken test Changes after review
  ...

Conflicts:
	app/assets/stylesheets/pages/pipelines.scss
	app/controllers/projects/pipelines_controller.rb
	app/views/projects/pipelines/index.html.haml
	spec/features/projects/pipelines/pipelines_spec.rb
2016-12-21 12:09:06 +01:00
..
abuse_report_mailer
abuse_reports
admin Merge branch '20492-access-token-scopes' into 'master' 2016-12-16 17:38:41 +00:00
award_emoji Disabled award emoji button when user is not logged in 2016-11-22 10:25:09 +00:00
ci Resolve conflict 2016-12-19 23:44:34 +00:00
dashboard 25617 Fix placeholder color of todo filters 2016-12-14 13:39:57 -08:00
devise Merge branch '15081-wrong-login-tab-ldap-frontend' into 'master' 2016-12-09 09:17:41 +00:00
discussions Use assigned variables better 2016-11-28 19:40:48 +00:00
doorkeeper View-related (and other minor) changes to !5951 based on @rymai's review. 2016-12-16 16:29:32 +05:30
email_rejection_mailer
emojis
errors Fix appearance in error pages 2016-11-29 11:44:07 -07:00
events Removed data-user-is view code 2016-11-25 13:45:34 +01:00
explore Shift emojis and icons styles into framework 2016-12-14 20:01:01 -05:00
groups Adds sort dropdown for group members 2016-12-16 20:28:33 -02:00
help Stop replacing `$your_email` with the user's email 2016-12-09 17:32:05 +01:00
import Reduce duplication for GitHubish import status view 2016-12-19 17:35:51 +01:00
invites Alert user when logged in user email is not the same as the invitation 2016-11-29 11:29:07 -02:00
issues
kaminari/gitlab Makes table pagination responsive 2016-11-01 16:24:54 +00:00
koding
layouts Merge branch '25743-clean-up-css-for-project-alerts-and-flash-notifications' into 'master' 2016-12-16 21:50:06 +00:00
notify Introduce `Ci::Stage`, right now this is artificial object that is build dynamically. 2016-12-06 14:13:21 +01:00
profiles Merge branch '20492-access-token-scopes' into 'master' 2016-12-16 17:38:41 +00:00
projects Merge branch 'master' into auto-pipelines-vue 2016-12-21 12:09:06 +01:00
repository_check_mailer Add support for nested groups to admin routing 2016-12-11 10:30:10 +02:00
search fix snippets reference id in search results (should be $ not #) 2016-12-10 00:57:23 -06:00
sent_notifications
shared Merge branch '19703-direct-link-pipelines' into 'master' 2016-12-20 21:21:52 +00:00
sherlock
snippets Remove pages/snippets css 2016-12-14 20:02:10 -05:00
u2f Display error code for U2F errors (!7305) 2016-11-07 13:15:18 +01:00
users Update avatar container name so it doesnt conflict with other image containers 2016-11-03 12:26:09 -05:00