Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix create_trigger_request_service_specrefactor-build-service | Kamil Trzcinski | 2015-10-05 | 3 | -7/+8 |
| | |||||
* | Fix gitlab_ci_yaml_processor specs | Kamil Trzcinski | 2015-10-05 | 1 | -0/+3 |
| | |||||
* | Fix GitLabCiService and remove ci_yaml_file from CI push data | Kamil Trzcinski | 2015-10-05 | 4 | -43/+13 |
| | |||||
* | Add stage tests | Kamil Trzcinski | 2015-10-05 | 2 | -1/+36 |
| | |||||
* | Make rubocop happy | Kamil Trzcinski | 2015-10-05 | 2 | -3/+3 |
| | |||||
* | Fix db/schema.rb | Kamil Trzcinski | 2015-10-05 | 1 | -58/+36 |
| | |||||
* | Fix rest of tests | Kamil Trzcinski | 2015-10-05 | 6 | -136/+67 |
| | |||||
* | Fix build pipelining | Kamil Trzcinski | 2015-10-05 | 3 | -2/+68 |
| | |||||
* | Fix next bunch of tests | Kamil Trzcinski | 2015-10-05 | 4 | -10/+23 |
| | |||||
* | Fix triggers spec | Kamil Trzcinski | 2015-10-05 | 2 | -26/+15 |
| | |||||
* | Fix next round of tests | Kamil Trzcinski | 2015-10-05 | 20 | -101/+103 |
| | |||||
* | Fix builds_without_retry | Kamil Trzcinski | 2015-10-05 | 3 | -13/+10 |
| | |||||
* | Make commit_spec run | Kamil Trzcinski | 2015-10-05 | 13 | -208/+226 |
| | |||||
* | Add user to Ci::Build to have pusher email address | Kamil Trzcinski | 2015-10-05 | 13 | -66/+29 |
| | |||||
* | Refactor commit and build | Kamil Trzcinski | 2015-10-05 | 32 | -193/+193 |
| | |||||
* | Merge pull request #9673 from fscherwi/patch-1 | Dmitriy Zaporozhets | 2015-10-04 | 1 | -1/+1 |
|\ | | | | | change build status image to svg | ||||
| * | change build status image to svg [ci skip] | fscherwi | 2015-09-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9690 from ggarnier/master | Dmitriy Zaporozhets | 2015-10-04 | 41 | -113/+85 |
|\ \ | | | | | | | Fix "useless assignment" Rubocop warnings | ||||
| * | | Fix rubocop warnings in features | Guilherme Garnier | 2015-10-03 | 6 | -35/+33 |
| | | | |||||
| * | | Fix rubocop warnings in spec/lib and spec/tasks | Guilherme Garnier | 2015-10-03 | 3 | -7/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Guilherme Garnier | 2015-10-03 | 39 | -238/+237 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'fix-cache-key-expiration-for-commits' into 'master' | Dmitriy Zaporozhets | 2015-10-03 | 4 | -4/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where transferring a project would result in stale commit links Transferring a project to another namespace updates the project's updated_at field, but since the cache key did not depend on the object, the page fragments were not invalidated. This resulted in stale links to the commits. Changing the cache key to use the project pathname solves this issue. Closes gitlab-org/omnibus-gitlab#843 See merge request !1497 | ||||
| * | | | Update README cache key to use full project namespace | Stan Hu | 2015-10-02 | 2 | -3/+3 |
| | | | | |||||
| * | | | Fix bug where transferring a project would result in stale commit links | Stan Hu | 2015-10-02 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transferring a project to another namespace updates the project's updated_at field, but since the cache key did not depend on the object, the page fragments were not invalidated. This resulted in stale links to the commits. Changing the cache key to use the object pathname solves this issue. Closes gitlab-org/omnibus-gitlab#843 | ||||
* | | | | Merge branch 'projects' into 'master' | Dmitriy Zaporozhets | 2015-10-03 | 5 | -4/+36 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project page height old thing. Grey block not aligned to the bottom. It was a scroll even with short project description. ![Screen_Shot_2015-10-01_at_16.03.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b412eeaa40c79861191d1a432d95951d/Screen_Shot_2015-10-01_at_16.03.24.png) New awesome stuff, no scroll, grey block aligned to the bottom. ![Screen_Shot_2015-10-01_at_16.04.08](https://gitlab.com/gitlab-org/gitlab-ce/uploads/823cdb6bfb8caec892ed001448f731e5/Screen_Shot_2015-10-01_at_16.04.08.png) See merge request !1487 | ||||
| * | | | removed max-heght from project.scssprojects | Andrey | 2015-10-02 | 1 | -6/+0 |
| | | | | |||||
| * | | | max height to layout.scss | Andrey | 2015-10-02 | 1 | -0/+6 |
| | | | | |||||
| * | | | section and .content now in layout.cssc | Andrey | 2015-10-02 | 2 | -11/+10 |
| | | | | |||||
| * | | | CSS markup fixed | Andrey | 2015-10-02 | 5 | -38/+30 |
| | | | | | | | | | | | | | | | | | | | | Everything is fixed according DZ comments. Added a bit sexy transition for our project buttons >< | ||||
| * | | | css aligning | Andrey | 2015-10-01 | 1 | -1/+0 |
| | | | | |||||
| * | | | content block height fix | Andrey | 2015-10-01 | 2 | -3/+45 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'public/hide_services_password' | Dmitriy Zaporozhets | 2015-10-02 | 5 | -3/+14 |
|\ \ \ \ | |||||
| * | | | | Hide password in the service settings formhide_services_password | Valery Sizov | 2015-10-02 | 5 | -3/+14 |
| | | | | | |||||
* | | | | | Merge branch 'access_level_badge_bug' into 'master' | Dmitriy Zaporozhets | 2015-10-02 | 4 | -3/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Wrong access level badge on MR comments https://gitlab.com/gitlab-org/gitlab-ce/issues/2654 See merge request !1501 | ||||
| * | | | | | Wrong access level badge on MR commentsaccess_level_badge_bug | Valery Sizov | 2015-10-02 | 4 | -3/+20 |
| | | | | | | |||||
* | | | | | | Merge branch 'rs-throttle-reset' into 'master' | Douwe Maan | 2015-10-02 | 7 | -101/+125 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throttle "Forgot your password?" emails Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611 See merge request !1476 | ||||
| * | | | | | 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 | ||||
* | | | | | | Merge branch 'migration-doc-fix' into 'master' | Jacob Vosmaer | 2015-10-02 | 1 | -1/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back and forth permission on builds/ @jacobvosmaer I missed that :( See merge request !1500 | ||||
| * | | | | | | Back and forth permission on builds/migration-doc-fix | Kamil Trzcinski | 2015-10-02 | 1 | -1/+8 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ensure-ci-project' into 'master' | Dmitriy Zaporozhets | 2015-10-02 | 11 | -122/+21 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure GitLab CI project exists when CI service is activated manually When I check activeated checkbox in project services for GitLab CI it cause half-working state when gitlab_ci_project is missing. This patch fixes it until we have proper behaviour implemented later This fix also bring us to the point when fork of project is a bit broken and have unnecessary code so I made cleanup. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan See merge request !1491 | ||||
| * | | | | | Fix tests | Dmitriy Zaporozhets | 2015-10-02 | 2 | -29/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |