gitlab-org--gitlab-foss/app
Lin Jen-Shin 99b142bcf6 Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL
* upstream/master: (251 commits)
  Don't match email addresses or foo@bar as user references
  Revert "Update GITLAB_SHELL_VERSION"
  Update GITLAB_SHELL_VERSION
  Add feature toggles through Flipper
  Change no_limits to limits
  Move includes call to scope
  Add GitLab Resources to University
  Add Documentation for GIT_CHECKOUT variable
  Remove entry variable
  Do not try to preload Commits when using Note.includes(:noteable)
  Ui improvements for count badges and permission badges
  Rename the other jobs
  Update jobs_spec for changes from builds_spec
  Introduce source to pipeline entity
  Update docs related to protected actions
  Add changelog for protected branches abilities fix
  Ask for an example project for bug reports
  Center loading spinner in issuable filters
  Fix chat commands specs related to protected actions
  Fix builds controller specs related to protected actions
  ...
2017-06-01 17:42:38 +08:00
..
assets Merge branch 'notebook-katex-fixes' into 'master' 2017-06-01 09:23:31 +00:00
controllers Merge branch 'dm-collapsed-blob' into 'master' 2017-06-01 09:10:53 +00:00
finders Add :owned param to ProjectFinder 2017-05-30 22:45:59 +02:00
helpers Merge branch 'dm-collapsed-blob' into 'master' 2017-06-01 09:10:53 +00:00
mailers Bugfix: Always use the default language when generating emails. 2017-05-25 10:22:45 -05:00
models Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL 2017-06-01 17:42:38 +08:00
policies Check only a merge ability for protected actions 2017-05-31 10:20:22 +02:00
presenters Fix conflict resolution from corrupted upstream 2017-05-12 20:47:51 +01:00
serializers Merge branch 'master' into 'trigger-source' 2017-05-31 21:15:40 +00:00
services Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL 2017-06-01 17:42:38 +08:00
uploaders
validators Avoid crash when trying to parse string with invalid UTF-8 sequence 2017-05-30 15:05:52 +00:00
views Merge branch 'dm-collapsed-blob' into 'master' 2017-06-01 09:10:53 +00:00
workers Introduce source to pipeline entity 2017-05-31 14:17:49 +02:00