b8ff38b1d4
Refactor PasswordsController to use before_actions
2015-10-01 21:47:27 -04:00
ad7ad8745a
Add User#recently_sent_password_reset?
2015-10-01 21:41:56 -04:00
5c80ceee0d
Autofocus the email field on the password reset form
2015-09-30 15:39:59 -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
0bf60630c0
Merge branch 'fix-view-admin-applications-text' into 'master'
...
Fixes english information paragraph in admin/applications view
See merge request !1470
2015-09-30 17:50:37 +00:00
bbb845b20b
Adds newline at end of file
2015-09-30 17:28:06 +00:00
63a6259328
Adds missing plural form of applications of previous commit
2015-09-30 17:26:55 +00:00
048dd5e458
Merge branch 'merge-ci-data' into 'master'
...
Use data stored in projects instead of ci_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.
/cc @dzaporozhets
See merge request !1404
2015-09-30 16:05:33 +00:00
247385a702
Merge branch 'fix-removed-file-in-diff' into 'master'
...
Fix bug when removed file was not appearing in merge request diff
Finally we can see removed files in merge request diff ✨
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fixes #2533
See merge request !1471
2015-09-30 15:41:22 +00:00
1ca119930f
Merge branch 'cleanup-ci-helpers' into 'master'
...
Cleanup ci helpers
Part of #2594
See merge request !1466
2015-09-30 14:07:04 +00: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
fe7e97320c
Fix bug when removed file was not appearing in merge request diff
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-30 12:31:23 +02:00
f71f165f99
Fix CI mailer
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-30 11:16:00 +02:00
34431d8ecb
Merge branch 'move-ci-settings' into 'master'
...
Move CI project settings page to CE project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Part of #2594
See merge request !1465
2015-09-30 08:49:46 +00:00
e471356f76
Fixes english information paragraph in admin/applications view
2015-09-30 08:34:00 +00:00
3d9a7cdb4b
Refactor CI helpers
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-29 16:26: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
2e8a3e3996
Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master'
...
Link directly to the projects page instead of the root controller
If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard.
Fixes bug introduced by !1446 .
See merge request !1459
2015-09-29 13:33:09 +00:00
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
0d877d91e7
Make ensure_gitlab_ci_project return ci_project or create a new one
2015-09-29 10:47:04 +02:00
0fa4ab5fd8
Rename commits to ci_commits
2015-09-29 10:47:04 +02:00
e60647f011
Fix rubocop
2015-09-29 10:47:03 +02:00
8f8efcfa00
Fix tests
2015-09-29 10:47:03 +02:00
2c1f7ccac8
Fix register_build_service tests
2015-09-29 10:47:03 +02:00
6abca12847
Revert check_enable_flag! changes
2015-09-29 10:47:03 +02:00
0e33814708
Fix tests
2015-09-29 10:47:03 +02:00
30c78e70cb
WIP
2015-09-29 10:47:03 +02:00
1530f68c98
WIP
2015-09-29 10:47:03 +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
3c997218f6
Merge branch 'projects' into 'master'
...
page-title-fix
Fixed .page-title margin
See merge request !1458
2015-09-29 07:29:07 +00:00
ada95df88e
Merge branch 'move-variables-page' into 'master'
...
Move CI variables page to project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Part of #2594
See merge request !1457
2015-09-29 07:28:07 +00:00
231ee19c81
Merge branch 'krb_auth_helper_ce' into 'master'
...
Remove 'kerberos' from auth_helper.rb for gitlab-CE.
There is no Kerberos auth in gitlab-ce, so it shouldn't be noted
as a form-driven auth mechanism in app/helpers/auth_helper.rb.
This breaks using Kerberos as a custom omniauth provider.
See issue #2510 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510 ).
@DouweM suggested I send in this merge request.
See merge request !1430
2015-09-29 07:27:08 +00:00
abae352e59
Link directly to the projects page instead of the root controller
...
If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard.
Fixes bug introduced by !1446 .
2015-09-28 21:24:24 -07:00
59582aae57
page-title-fix
2015-09-28 17:58:30 +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
d8e631c1e5
Merge branch 'cyrillic-font' into 'master'
...
Update Source Sans Pro font: adds support for cyrillic characters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fixes #2764
See merge request !1454
2015-09-28 14:20:28 +00:00
10c036fcf5
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-09-28 15:43:27 +02:00
1c1c7e1abd
Merge branch 'fxposter/gitlab-ce-login-from-admin'
2015-09-28 15:43:02 +02:00
145d933880
Merge branch 'projects'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 13:42:41 +02:00
ad67912760
!important removed from pre
2015-09-28 12:03:41 +02:00
ce49e49bfb
edit action allign
2015-09-28 11:26:42 +02:00
74bdd67f21
Update Source Sans Pro font: adds support for cyrillic characters
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 11:12:03 +02:00
ac34ce8648
Merge branch 'add-activity-dashboard-preference' into 'master'
...
Add user preference to view project activity and starred project activity as default dashboard
Screenshot:
Closes #2662
See merge request !1446
2015-09-28 08:23:59 +00:00
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
a9cfa6c508
Fix grammar in admin area labels .nothing-here-block when no labels exist.
...
updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
2015-09-26 11:25:26 -07: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
12acf15c90
Project page Update
...
refactoring buttons, fixes for projects filter on the dashboard and
group page
2015-09-25 20:33:05 +02: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
Robert Speicher
Robert Speicher
Diogo Resende
Dmitriy Zaporozhets
Kamil Trzcinski
Douwe Maan
Stan Hu
Andrey
Aaron Snyder
