Commit Graph
276 Commits
Author SHA1 Message Date
Robert Speicher f036d4095e Fix spec broken by updated Devise translations 2015-10-01 23:46:43 -04:00
Robert Speicher b8ff38b1d4 Refactor PasswordsController to use before_actions 2015-10-01 21:47:27 -04:00
Robert Speicher 9052f13b31 Remove specs for "login after reset"
We're now using default Devise behavior, so these tests were redundant.
2015-09-30 16:15:56 -04:00
Robert Speicher ceb21cc49f Update feature spec 2015-09-30 15:47:48 -04:00
Robert Speicher 292bca0546 Only allow password reset emails once per minute
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611
2015-09-30 15:38:21 -04:00
Robert Speicher 3a4274e19e Take advantage of Devise.sign_in_after_reset_password 2015-09-30 14:35:00 -04:00
Kamil Trzcinski ad765353f6 Fix sometimes failing tests 2015-09-30 12:51:03 +02:00
Kamil Trzcinski b9ccc79cb5 Delegate ci_project parameters to projects
- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.
2015-09-30 12:48: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
Dmitriy Zaporozhets 2c3355f958 Merge branch 'ci-commits-to-projects' into 'master'
Make Ci::Commits belong to Project instead of Ci::Project



See merge request !1455
2015-09-29 11:44:07 +00:00
Kamil Trzcinski 30c78e70cb WIP 2015-09-29 10:47:03 +02:00
Dmitriy Zaporozhets 2a0d4e7200 Move CI triggers page to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-29 10:37:31 +02:00
Dmitriy Zaporozhets 037defc7de Move CI variables page to project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 17:19:20 +02:00
Dmitriy Zaporozhets b656419591 Merge branch 'move-runners-page' 2015-09-28 16:47:18 +02:00
Douwe Maan 1c1c7e1abd Merge branch 'fxposter/gitlab-ce-login-from-admin' 2015-09-28 15:43:02 +02:00
Dmitriy Zaporozhets c876bfa0f2 Add missing spec file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 11:01:45 +02:00
Dmitriy Zaporozhets 92f8e0fd7e Finish move of runners page to project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 10:14:53 +02:00
Pavel Forkert 3dec9dc4a3 Clarify spec title explanation 2015-09-24 16:40:21 +03:00
Pavel Forkert eb9528b8b9 Move login button to user page, switched to POST method 2015-09-24 16:34:04 +03:00
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user
Closes #2291
2015-09-24 16:14:16 +03:00
Dmitriy Zaporozhets 2759b13ae9 Remove CI dashboard
With CI status integrated at GitLab projects page there is no reason to keep it
anymore.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 15:10:25 +02:00
Dmitriy Zaporozhets eae27d1ecb Move CI charts to project graphs area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 16:24:46 +02: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
Kamil Trzcinski fe42de3a48 Fix: features/ci/admin/runners_spec.rb 2015-09-15 22:15:28 +02:00
Kamil Trzcinski 29b3279a95 Fix: features/ci/events_spec.rb once again 2015-09-15 22:04:42 +02:00
Kamil Trzcinski 6cc15cf721 Fix: features/ci/triggers_spec.rb 2015-09-15 21:23:45 +02:00
Kamil Trzcinski 64ef1b3dcd Fix: features/ci/triggers_spec.rb 2015-09-15 21:22:51 +02:00
Kamil Trzcinski 5285e01d54 Fix: features/ci/runners_spec.rb 2015-09-15 21:21:46 +02:00
Kamil Trzcinski 9621f433a7 Fix: features/ci/projects_spec.rb 2015-09-15 21:06:12 +02:00
Kamil Trzcinski a598bd91f9 Refactor ci_admin_event and fix features/ci/events_spec.rb 2015-09-15 20:56:20 +02:00
Valery Sizov b87ca7500f fix specs. Stage 7 2015-09-15 17:43:17 +03:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Dmitriy Zaporozhets b35d5a6a16 Merge branch 'public_profiles' into 'master'
Make all group public

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#

Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361

See merge request !1247
2015-09-14 15:28:42 +00:00
Dmitriy Zaporozhets 66840f03cc Fix tests for group access 2015-09-14 12:15:11 +02:00
Dmitriy Zaporozhets 0615de013d Fix ci commits features specs 2015-09-11 13:05:31 +02:00
Dmitriy Zaporozhets a8dd4d36e2 Fix build features specs 2015-09-11 12:52:56 +02:00
Dmitriy Zaporozhets 4e7b47dde1 Convert ci features specs to v3 2015-09-10 16:56:21 +02:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets cc4ef4da11 Refactor CI tests 2015-09-09 14:17:16 +02:00
Douwe Maan e4b30f9db3 Fix help access spec 2015-09-09 10:22:19 +01:00
Valery Sizov b7431ec042 Make all group public 2015-09-09 11:27:03 +03:00
Douwe Maan f87f6480b2 Use new routing helper 2015-09-08 17:53:16 +01:00
Robert Speicher 2930041886 Make sure the gfm helper passes the required options
This adds some duplication, but this helper is temporary.
2015-08-31 18:09:18 -04:00
Robert Speicher 4340dd3eeb Decouple Gitlab::Markdown from the GitlabMarkdownHelper
This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).
2015-08-27 14:17:26 -07:00
Robert Speicher c401543d02 Fix failing spec 2015-08-25 15:57:55 -07:00
Robert Speicher 2c3e42e4a4 Remove user_color_scheme_class
Instead of rendering this value server-side, we use Javascript and Gon
to apply the user's color scheme (or the default) to any syntax
highlighted code blocks.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.
2015-08-25 15:32:38 -07:00
Robert Speicher 907860ed3d Remove the gfm_with_options helper
It was redundant because `gfm` also took options.
2015-08-12 23:32:16 -04:00
Douwe Maan 674e1c7458 Fix spec 2015-08-06 17:15:37 +02:00
Robert Speicher 8c957b54f5 Fix setup/teardown for Markdown feature spec
Prior, CI seemed to be freezing after running these specs.
2015-07-29 00:06:52 -04:00
Robert Speicher 05f9a6a9c4 Update Markdown feature to allow for multiple pipelines 2015-07-28 18:56:27 -04:00