b8ff38b1d4
Refactor PasswordsController to use before_actions
2015-10-01 21:47:27 -04:00
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
3a4274e19e
Take advantage of `Devise.sign_in_after_reset_password`
2015-09-30 14:35:00 -04:00
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
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
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
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
b656419591
Merge branch 'move-runners-page'
2015-09-28 16:47:18 +02:00
1c1c7e1abd
Merge branch 'fxposter/gitlab-ce-login-from-admin'
2015-09-28 15:43:02 +02:00
0383afc66a
Add user preference to view project activity and starred project activity as default dashboard
...
Closes #2662
2015-09-26 08:46:05 -07:00
b328c76c06
Move runners page to project settings
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-25 18:03:41 +02:00
83347954fc
Add option to admin area to sign in as a specific user
...
Closes #2291
2015-09-24 16:14:16 +03:00
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
9c4307e287
Show CI status on commit page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 11:21:39 +02:00
50cff3e400
Check for CI enabled in correct place
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 09:47:52 +02:00
64e12d5853
Add header for ci graphs and check that it is enabled
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 09:44:38 +02:00
ea58395525
Merge branch 'master' into move-ci-charts
2015-09-24 09:40:32 +02:00
a58c6e9a95
Merge branch 'cleanup-ci-dashboard' into 'master'
...
Cleanup ci dashboard
Part of #2594 . Based on !1403
* remove rendering GitLab projects with not enabled CI on CI dashboard
* remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`)
* simplify the projects query for CI dashboard
See merge request !1405
2015-09-24 07:32:29 +00:00
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
368a40fce6
Remove non-existing page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 15:35:43 +02:00
c3f63d6f77
Fix search for ci projects and cleanup unnecessary code
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 15:33:36 +02:00
31b15e3dce
Simplify CI projects query
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 15:30:24 +02:00
0731a7af31
Show only enabled CI projects
...
Since CI is enabled by pushing .gitlab-ci.yml file there is no need to
add CI project via dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 15:00:05 +02:00
ff63a166e9
Merge branch 'rs-fix-help-links' into 'master'
...
Prevent double-prefixing of help page paths
Closes #2679
See merge request !1400
2015-09-23 11:44:17 +00:00
95f73a68fa
Simplify help path prefixing
2015-09-23 00:24:17 -04:00
64e0dfa530
Prevent double-prefixing of help page paths
...
Prior, because the link "api/README.md" was matched twice, the first
link became "help/help/api/README.md". Now we do a negative lookahead to
make sure the link doesn't start with `help/`.
This fix is still not ideal, see TODO note.
2015-09-22 18:26:51 -04:00
d80750b50f
Fix error when MR source branch no longer exists.
2015-09-22 17:49:45 +02:00
8ae026a6e6
Merge branch 'fix-ci-permissions' into 'master'
...
Fix CI permissions
This fixes two problems:
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users
See merge request !1379
2015-09-22 07:54:11 +00:00
ba71542a5a
Merge branch 'fix-issue-2593' into 'master'
...
Fix Error 500 when comparing non-existing branches
Closes #2593
See merge request !1355
2015-09-21 20:46:15 +00:00
68cdeb71d5
Fix permissions problems
...
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users
2015-09-21 20:28:56 +02:00
3a001a9290
Fetch merge request ref if it is missing when visit MR page
...
This will fix merge problem for merge requests between forks created
before 8.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-21 16:25:59 +02:00
183892fde9
Merge branch 'notification-levels' into 'master'
...
Notification levels can now be set on the Project's main page
The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.
Saving is done via a remote form submission and if successful shows the user a flash message:
@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.
@rspeicher hopefully we can include it with the 8.0 release, maybe?
/cc @darby
See merge request !1322
2015-09-21 09:19:32 +00:00
47e926bec0
Minor code cleanup
2015-09-20 19:09:43 +02:00
259851c0d6
Bump devise-two-factor to 2.0.0
...
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605
See https://github.com/tinfoil/devise-two-factor/pull/43
2015-09-19 21:16:18 -04:00
69723d2002
Devise 3.5.x deprecates `confirm!` in favor of `confirm`
2015-09-19 21:15:13 -04:00
de8497ca56
Fix Error 500 when comparing non-existing branches
...
Closes #2593
2015-09-18 12:02:01 -07:00
a0c1a12dee
remove API calls from CE to CI
2015-09-18 18:02:11 +02:00
e41a29b0c3
Allow to disable GitLab CI
2015-09-18 12:46:47 +02:00
1eb3dde45b
Merge branch 'add-custom-text-to-help' into 'master'
...
Allow custom info to be added to Help page
Fixes #2536
**Admin screen**
**Text on the Help page**
/cc @DouweM
See merge request !1309
2015-09-18 09:24:15 +00:00
d272682a15
Merge branch 'fix-ci-non-public-project' into 'master'
...
Fix 500 when accessing private project when not logged in
See merge request !1336
2015-09-18 09:18:49 +00:00
3984818bb3
Merge branch 'ci_projects_order' into 'master'
...
Fix: ci projects order
https://gitlab.com/gitlab-org/gitlab-ce/issues/2553
See merge request !1333
2015-09-18 08:54:06 +00:00
fe17a236e3
Allow custom info to be added to Help page
...
Fixes #2536
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-09-18 10:15:40 +02:00
d4be967478
Fix 500 when accessing private project when not logged in
2015-09-17 23:27:08 +02:00
b7e49d8042
Fix: ci projects order
2015-09-17 20:12:17 +03:00
0aec0d53b1
Merge branch 'remove-ci-help' into 'master'
...
Remove CI help
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2556
See merge request !1325
2015-09-17 16:22:24 +00:00
7166f7b7cf
Remove CI help
2015-09-17 17:09:10 +02:00
ac855e5ed3
Move partial locals out of controller
2015-09-17 07:24:45 -07:00
f481637245
Merge branch 'fix-issue-2382' into 'master'
...
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity
Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".
Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:
Closes #2382
See merge request !1227
2015-09-17 08:04:37 +00:00
23f9a64566
Use the `find_by_user_id` magic finder instead of `where`.
2015-09-16 21:02:40 -05:00
1ddefa3bea
Merge branch 'master' into notification-levels
2015-09-16 19:54:18 -05:00
Robert Speicher
Kamil Trzcinski
Dmitriy Zaporozhets
Douwe Maan
Stan Hu
Pavel Forkert
Robert Speicher
Valery Sizov
Jeroen van Baarsen
Valery Sizov
Patricio Cano
