Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Allow removing of project without confirmation when JavaScript is disabled | Stan Hu | 2015-10-07 | 1 | -1/+1 | |
| |/ | | | | | | | Closes #2485 | |||||
* | | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-07 | 23 | -47/+596 | |
|\ \ | |/ | ||||||
| * | Fix ci build routing and few testsci-build-page | Dmitriy Zaporozhets | 2015-10-06 | 1 | -22/+20 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Refactor commit/build tests and fix CI cancel | Dmitriy Zaporozhets | 2015-10-06 | 3 | -61/+34 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Merge branch 'refactor-build-service' into 'master' | Kamil Trzciński | 2015-10-05 | 1 | -2/+5 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build. All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository. All code related for creating builds is moved to CreateBuildsService. Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API. This is partially working, tests are not yet touched. This slightly changes view of Commit:  @dzaporozhets What do you think? See merge request !1502 | |||||
| | * | Fix rest of tests | Kamil Trzcinski | 2015-10-05 | 1 | -2/+6 | |
| | | | ||||||
| | * | Fix next round of tests | Kamil Trzcinski | 2015-10-05 | 1 | -3/+2 | |
| | | | ||||||
| * | | Move CI web hooks page to project settings area | Dmitriy Zaporozhets | 2015-10-05 | 1 | -0/+27 | |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Fix rubocop warnings in features | Guilherme Garnier | 2015-10-03 | 1 | -4/+4 | |
| | | ||||||
| * | Merge branch 'rs-throttle-reset' into 'master' | Douwe Maan | 2015-10-02 | 2 | -33/+23 | |
| |\ | | | | | | | | | | | | | | | | | | | Throttle "Forgot your password?" emails Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611 See merge request !1476 | |||||
| | * | 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 | 1 | -1/+1 | |
| | | | ||||||
| | * | 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 | |
| | | | ||||||
| | * | Only allow password reset emails once per minute | Robert Speicher | 2015-09-30 | 1 | -7/+36 | |
| | | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611 | |||||
| * | | Merge branch 'disable-report-button-if-already-reported' into 'master' | Douwe Maan | 2015-10-01 | 1 | -2/+2 | |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the "Report abuse" button if a user has already been reported Hello, I've implemented the feature request #2330. Here is what it looks like:  I hope that's an acceptable solution. cc @DouweM See merge request !1456 | |||||
| | * | Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reported | Rémy Coutable | 2015-09-29 | 1 | -35/+1 | |
| | | | | | | | | | | | | | | | | | | This simplifies the "Report button" to not use open a dropdown and adds a tooltip on this button. This also removes an extra spec and adds missing specs. | |||||
| | * | Disable the "Report abuse" button if a user has already been reported | Rémy Coutable | 2015-09-29 | 1 | -2/+36 | |
| | | | ||||||
| * | | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-reset | Robert Speicher | 2015-09-30 | 1 | -24/+24 | |
| | | | ||||||
| * | | Fix sometimes failing tests | Kamil Trzcinski | 2015-09-30 | 1 | -5/+5 | |
| | | | ||||||
| * | | Delegate ci_project parameters to projects | Kamil Trzcinski | 2015-09-30 | 1 | -9/+8 | |
| | | | | | | | | | | | | | | | | | | | | | - 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. | |||||
| * | | Move CI project settings page to CE project settings areamove-ci-settings | Dmitriy Zaporozhets | 2015-09-29 | 2 | -18/+22 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Merge branch 'ci-commits-to-projects' into 'master' | Dmitriy Zaporozhets | 2015-09-29 | 3 | -16/+17 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make Ci::Commits belong to Project instead of Ci::Project See merge request !1455 | |||||
| | * | | WIP | Kamil Trzcinski | 2015-09-29 | 3 | -16/+17 | |
| | | | | ||||||
| * | | | Move CI triggers page to project settings areamove-triggers-page | Dmitriy Zaporozhets | 2015-09-29 | 1 | -4/+5 | |
| |/ / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Move CI variables page to project settingsmove-variables-page | Dmitriy Zaporozhets | 2015-09-28 | 1 | -9/+6 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Merge branch 'move-runners-page' | Dmitriy Zaporozhets | 2015-09-28 | 1 | -17/+8 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Add missing spec filemove-runners-page | Dmitriy Zaporozhets | 2015-09-28 | 1 | -0/+87 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | Finish move of runners page to project settings | Dmitriy Zaporozhets | 2015-09-28 | 1 | -96/+0 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Merge branch 'fxposter/gitlab-ce-login-from-admin' | Douwe Maan | 2015-09-28 | 1 | -0/+21 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Clarify spec title explanation | Pavel Forkert | 2015-09-24 | 1 | -1/+1 | |
| | | | ||||||
| | * | Move login button to user page, switched to POST method | Pavel Forkert | 2015-09-24 | 1 | -16/+21 | |
| | | | ||||||
| | * | Add option to admin area to sign in as a specific user | Pavel Forkert | 2015-09-24 | 1 | -0/+16 | |
| | | | | | | | | | | | | Closes #2291 | |||||
| * | | Remove CI dashboard | Dmitriy Zaporozhets | 2015-09-24 | 1 | -10/+0 | |
| |/ | | | | | | | | | | | | | 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> | |||||
| * | Move CI charts to project graphs area | Dmitriy Zaporozhets | 2015-09-23 | 1 | -12/+0 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2015-09-15 | 4 | -8/+8 | |
| |\ | | | | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock | |||||
| | * | Merge branch 'public_profiles' into 'master' | Dmitriy Zaporozhets | 2015-09-14 | 1 | -3/+3 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | Fix tests for group access | Dmitriy Zaporozhets | 2015-09-14 | 1 | -6/+6 | |
| | | | | ||||||
| | | * | Make all group public | Valery Sizov | 2015-09-09 | 1 | -9/+9 | |
| | | | | ||||||
| | * | | Fix help access spec | Douwe Maan | 2015-09-09 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Use new routing helper | Douwe Maan | 2015-09-08 | 3 | -4/+4 | |
| | |/ | ||||||
| * | | Fix: features/ci/admin/runners_spec.rb | Kamil Trzcinski | 2015-09-15 | 1 | -4/+6 | |
| | | | ||||||
| * | | Fix: features/ci/events_spec.rb once again | Kamil Trzcinski | 2015-09-15 | 1 | -3/+5 | |
| | | | ||||||
| * | | Fix: features/ci/triggers_spec.rb | Kamil Trzcinski | 2015-09-15 | 1 | -2/+4 | |
| | | | ||||||
| * | | Fix: features/ci/triggers_spec.rb | Kamil Trzcinski | 2015-09-15 | 1 | -2/+4 | |
| | | | ||||||
| * | | Fix: features/ci/runners_spec.rb | Kamil Trzcinski | 2015-09-15 | 1 | -11/+9 | |
| | | | ||||||
| * | | Fix: features/ci/projects_spec.rb | Kamil Trzcinski | 2015-09-15 | 1 | -10/+13 | |
| | | | ||||||
| * | | Refactor ci_admin_event and fix features/ci/events_spec.rb | Kamil Trzcinski | 2015-09-15 | 2 | -3/+3 | |
| | | | ||||||
| * | | fix specs. Stage 7 | Valery Sizov | 2015-09-15 | 9 | -59/+59 | |
| | | | ||||||
| * | | fix specs. Stage 5 | Valery Sizov | 2015-09-15 | 1 | -2/+2 | |
| | | |