Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Conform to spec guidelines that only exist in my headrs-throttle-reset | Robert Speicher | 2015-10-02 | 1 | -1/+1 |
| | | | | [ci skip] | ||||
* | Fix spec broken by updated Devise translations | Robert Speicher | 2015-10-01 | 1 | -1/+1 |
| | |||||
* | Refactor PasswordsController to use before_actions | Robert Speicher | 2015-10-01 | 2 | -22/+22 |
| | |||||
* | Add recently_reset message to Devise translations | Robert Speicher | 2015-10-01 | 1 | -0/+1 |
| | |||||
* | Add User#recently_sent_password_reset? | Robert Speicher | 2015-10-01 | 2 | -0/+24 |
| | |||||
* | Update config/locales/devise.en.yml with latest version | Robert Speicher | 2015-10-01 | 1 | -51/+52 |
| | | | | | It looks like a lot of changes but it's not, they just sorted it alphabetically. | ||||
* | Remove specs for "login after reset" | Robert Speicher | 2015-09-30 | 1 | -40/+0 |
| | | | | We're now using default Devise behavior, so these tests were redundant. | ||||
* | Update feature spec | Robert Speicher | 2015-09-30 | 1 | -0/+1 |
| | |||||
* | Autofocus the email field on the password reset form | Robert Speicher | 2015-09-30 | 1 | -1/+1 |
| | |||||
* | Only allow password reset emails once per minute | Robert Speicher | 2015-09-30 | 2 | -14/+51 |
| | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611 | ||||
* | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-reset | Robert Speicher | 2015-09-30 | 3 | -45/+28 |
| | |||||
* | Merge branch 'merge-ci-data' | Kamil Trzcinski | 2015-09-30 | 1 | -1/+1 |
|\ | |||||
| * | Fix migrationmerge-ci-data | Kamil Trzcinski | 2015-09-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'fix-view-admin-applications-text' into 'master' | Robert Speicher | 2015-09-30 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Fixes english information paragraph in admin/applications view See merge request !1470 | ||||
| * | | Adds newline at end of file | Diogo Resende | 2015-09-30 | 1 | -1/+1 |
| | | | |||||
| * | | Adds missing plural form of applications of previous commit | Diogo Resende | 2015-09-30 | 1 | -1/+1 |
| | | | |||||
| * | | Fixes english information paragraph in admin/applications view | Diogo Resende | 2015-09-30 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'apache-gghs-tcp' into 'master' | Robert Speicher | 2015-09-30 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Apache needs gitlab-git-http-server on TCP [ci skip] See merge request !1462 | ||||
| * | | | Apache needs gitlab-git-http-server on TCPapache-gghs-tcp | Jacob Vosmaer | 2015-09-29 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'golang-ruby-versions' into 'master' | Robert Speicher | 2015-09-30 | 1 | -6/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Ruby and Golang versions [ci skip] See merge request !1467 | ||||
| * | | | | Use Ruby 2.1.7 for new installs from sourcegolang-ruby-versions | Jacob Vosmaer | 2015-09-29 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Use Golang 1.5.1 for new installs from source | Jacob Vosmaer | 2015-09-29 | 1 | -4/+4 |
| |/ / / | |||||
* | | | | Merge branch 'merge-ci-data' into 'master' | Dmitriy Zaporozhets | 2015-09-30 | 12 | -98/+122 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Fix sometimes failing tests | Kamil Trzcinski | 2015-09-30 | 1 | -5/+5 |
| | | | | |||||
| * | | | Delegate ci_project parameters to projects | Kamil Trzcinski | 2015-09-30 | 12 | -93/+117 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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. | ||||
* | | | | Merge branch 'fix-removed-file-in-diff' into 'master' | Dmitriy Zaporozhets | 2015-09-30 | 6 | -51/+70 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug when removed file was not appearing in merge request diff Finally we can see removed files in merge request diff :sparkles: Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #2533 See merge request !1471 | ||||
| * | | | | Fix invalid testsfix-removed-file-in-diff | Dmitriy Zaporozhets | 2015-09-30 | 2 | -36/+36 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Fix bug when removed file was not appearing in merge request diff | Dmitriy Zaporozhets | 2015-09-30 | 4 | -15/+34 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'cleanup-ci-helpers' into 'master' | Dmitriy Zaporozhets | 2015-09-30 | 14 | -144/+94 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup ci helpers Part of #2594 See merge request !1466 | ||||
| * | | | | Fix CI mailercleanup-ci-helpers | Dmitriy Zaporozhets | 2015-09-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Refactor CI helpers | Dmitriy Zaporozhets | 2015-09-29 | 13 | -143/+94 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch 'fix-clear-crontab-in-ci-migration-guide' into 'master' | Kamil TrzciĆski | 2015-09-30 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Add a missing RAILS_ENV=production to fix crontab clearing in the CI migration guide All other commands in the guide set this env var, but it's missing for the `whenever --clear-crontab` call and this causes it to not clear the crontab properly. See merge request !1474 | ||||
| * | | | | Add a missing RAILS_ENV=production to crontab clearing | Dimitar Dimitrov | 2015-09-30 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | All other commands in the guide set this env var, but it's missing here and this causes whenever not to clear the crontab file of gitab_ci properly. | ||||
* | | | | Merge branch 'move-ci-settings' into 'master' | Dmitriy Zaporozhets | 2015-09-30 | 12 | -71/+86 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | 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 | ||||
| * | | Move CI project settings page to CE project settings areamove-ci-settings | Dmitriy Zaporozhets | 2015-09-29 | 12 | -71/+86 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master' | Dmitriy Zaporozhets | 2015-09-29 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Link directly to the projects page instead of the root controller | Stan Hu | 2015-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge branch 'ci-commits-to-projects' into 'master' | Dmitriy Zaporozhets | 2015-09-29 | 39 | -156/+209 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make Ci::Commits belong to Project instead of Ci::Project See merge request !1455 | ||||
| * | | | Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projects | Kamil Trzcinski | 2015-09-29 | 5 | -16/+9 |
| | | | | |||||
| * | | | Fix migrations | Kamil Trzcinski | 2015-09-29 | 2 | -23/+11 |
| | | | | |||||
| * | | | Fix tests | Kamil Trzcinski | 2015-09-29 | 4 | -8/+9 |
| | | | | |||||
| * | | | Rename commits to ci_commits | Kamil Trzcinski | 2015-09-29 | 3 | -6/+12 |
| | | | | |||||
| * | | | Fix rubocop | Kamil Trzcinski | 2015-09-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix tests | Kamil Trzcinski | 2015-09-29 | 6 | -14/+10 |
| | | | | |||||
| * | | | Fix register_build_service tests | Kamil Trzcinski | 2015-09-29 | 3 | -8/+11 |
| | | | | |||||
| * | | | Revert check_enable_flag! changes | Kamil Trzcinski | 2015-09-29 | 1 | -4/+4 |
| | | | | |||||
| * | | | Fix db/schema.rb | Kamil Trzcinski | 2015-09-29 | 1 | -26/+29 |
| | | | | |||||
| * | | | Fix migrations | Kamil Trzcinski | 2015-09-29 | 5 | -32/+15 |
| | | | | |||||
| * | | | Fix tests | Kamil Trzcinski | 2015-09-29 | 11 | -49/+73 |
| | | | | |||||
| * | | | WIP | Kamil Trzcinski | 2015-09-29 | 29 | -135/+154 |
| | | | |