Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee ...

Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb

2015-11-19 10:33:18 -05:00

..

blame

Move project header title definition to view in question.

2015-09-17 12:16:24 +02:00

blob

Replace CoffeeScript block into JavaScript in Views.

2015-11-10 19:17:37 +08:00

branches

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

builds

Merge branch 'fix_project_build_links' into 'master'

2015-11-12 09:41:54 +00:00

buttons

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

ci_services

CI details cleanup

2015-11-05 15:24:27 +01:00

ci_settings

Remove deprecated dumped yaml file generated from previous job definitions

2015-11-10 12:14:41 +01:00

ci_web_hooks

CI details cleanup

2015-11-05 15:24:27 +01:00

commit

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

commit_statuses

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

commits

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

compare

Move project header title definition to view in question.

2015-09-17 12:16:24 +02:00

deploy_keys

Limit content width for big screens except certain pages

2015-08-26 11:51:28 +02:00

diffs

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

forks

Show message if user tries to fork and has no available namespaces

2015-10-08 15:20:19 -05:00

git_hooks

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

graphs

Expose CI enable option in project features

2015-11-13 10:52:50 +01:00

group_links

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

hooks

defined class prepend-top-10 used for alignment issue

2015-11-05 20:21:46 +05:30

imports

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

issues

Add "Copy to clipboard" buttons

2015-10-23 15:31:43 +02:00

labels

Fix label destroy js

2015-10-29 14:22:11 +01:00

merge_requests

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-13 12:34:34 -05:00

milestones

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

mirrors

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

network

Fix default avatar not showing up in network graph

2015-09-24 08:31:18 -07:00

notes

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

project_members

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

protected_branches

Make tables full width.

2015-10-19 11:19:45 +02:00

refs

Fix commit data retrieval when branch name has single quotes

2015-07-26 03:47:01 -07:00

releases

Add missing param and title for tag

2015-11-09 15:39:18 +01:00

repositories

Apply new design to files page

2015-10-13 16:41:48 +02:00

runners

CI details cleanup

2015-11-05 15:24:27 +01:00

services

Make tables full width.

2015-10-19 11:19:45 +02:00

snippets

Update style of snippets pages

2015-10-18 13:03:26 +02:00

tags

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

tree

Fix duplication between tree_header and tree_content

2015-10-21 08:41:53 +02:00

triggers

CI details cleanup

2015-11-05 15:24:27 +01:00

variables

CI details cleanup

2015-11-05 15:24:27 +01:00

wikis

Render same markdown hint for issue, merge request, wiki and comment forms

2015-11-07 20:22:16 +01:00

_activity.html.haml

Replace CoffeeScript block into JavaScript in Views.

2015-11-10 19:17:37 +08:00

_bitbucket_import_modal.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

_commit_button.html.haml

Remove mention of branch to commit to.

2015-03-19 17:43:21 -07:00

_errors.html.haml

alert-error to alert-danger

2013-12-31 16:34:14 +02:00

_files.html.haml

Tweak styling of project home files list.

2015-10-17 19:18:28 +02:00

_github_import_modal.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

_gitlab_import_modal.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

_home_panel.html.haml

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

_issues_settings.html.haml

remove placeholders

2015-10-08 18:20:53 +02:00

_last_commit.html.haml

CI details cleanup

2015-11-05 15:24:27 +01:00

_last_push.html.haml

Fix last push widget

2015-09-15 11:02:37 +02:00

_md_preview.html.haml

Don't use link_to/image_tag where not needed

2015-10-15 12:05:01 +02:00

_merge_request_settings.html.haml

remove placeholders

2015-10-08 18:20:53 +02:00

_readme.html.haml

Restore edit button in project readme

2015-10-22 17:11:21 +02:00

_zen.html.haml

Don't use link_to/image_tag where not needed

2015-10-15 12:05:01 +02:00

activity.html.haml

Move last push info at top of project page.

2015-10-17 19:15:32 +02:00

edit.html.haml

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-15 00:30:17 -05:00

empty.html.haml

Don't show "Add README" link in an empty repository if user doesn't have access to push

2015-10-21 07:33:14 -07:00

go_import.html.haml

Render go-import meta tag for private repos.

2015-03-03 11:22:30 +01:00

new.html.haml

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

no_repo.html.haml

Introduce shortcuts for routing helpers

2015-02-25 19:34:16 -08:00

remove_fork.js.haml

Adds ability to remove the forked relationship

2015-10-13 21:42:17 +11:00

show.atom.builder

Fix Atom feeds.

2015-05-21 11:39:33 +02:00

show.html.haml

Remove redundant helper method.

2015-10-17 19:16:04 +02:00

transfer.js.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

update.js.haml

Move jQuery enable/disable extensions to extensions/jquery

2015-06-02 20:32:07 -04:00