diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-16 11:57:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-16 11:57:40 +0000 |
| commit | cccd269da3f5d82c5d14289980d9b52c9cad08db (patch) | |
| tree | 2947658dfff44a3873f7d350f0353dbdb7b9b541 /app/views/ci/user_sessions/new.html.haml | |
| parent | 7d59ba00b9aa1a8be28f1b7ccaa1c628be90aabb (diff) | |
| parent | ac8d2eb065e9522679d4eae4649c6815daa5460c (diff) | |
| download | gitlab-ce-cccd269da3f5d82c5d14289980d9b52c9cad08db.tar.gz | |
Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' into 'master'
Merge CI into CE
First step of #2164.
- [x] Merge latest CE master
- [x] Make application start
- [x] Re-use gitlab sessions (remove CI oauth part)
- [x] Get rid of gitlab_ci.yml config
- [x] Make tests start
- [x] Make most CI features works
- [x] Make tests green
- [x] Write migration documentation
- [x] Add CI builds to CE backup
See merge request !1204
Diffstat (limited to 'app/views/ci/user_sessions/new.html.haml')
| -rw-r--r-- | app/views/ci/user_sessions/new.html.haml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/ci/user_sessions/new.html.haml b/app/views/ci/user_sessions/new.html.haml new file mode 100644 index 00000000000..308b217ea78 --- /dev/null +++ b/app/views/ci/user_sessions/new.html.haml @@ -0,0 +1,8 @@ +.login-block + %h2 Login using GitLab account + %p.light + Make sure you have account on GitLab server + = link_to GitlabCi.config.gitlab_server.url, GitlabCi.config.gitlab_server.url, no_turbolink + %hr + = link_to "Login with GitLab", auth_ci_user_sessions_path(state: params[:state]), no_turbolink.merge( class: 'btn btn-login btn-success' ) + |