summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-10-056-28/+3
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-056-28/+3
| |\ | | | | | | | | | See merge request !1512
| | * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-056-28/+3
| | | | | | | | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
* | | Merge branch 'user-preferences-layout-option' of ↵Dmitriy Zaporozhets2015-10-056-1/+27
|\ \ \ | |/ / |/| | | | | | | | | | | https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | improved code style and layout option namingPeter Göbel2015-10-055-6/+6
| | |
| * | added user preference to change layout widthPeter Göbel2015-10-056-1/+27
| | |
* | | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-0528-236/+188
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: ![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png) @dzaporozhets What do you think? See merge request !1502
| * | | Fix create_trigger_request_service_specrefactor-build-serviceKamil Trzcinski2015-10-051-1/+2
| | | |
| * | | Fix GitLabCiService and remove ci_yaml_file from CI push dataKamil Trzcinski2015-10-051-21/+2
| | | |
| * | | Add stage testsKamil Trzcinski2015-10-051-1/+2
| | | |
| * | | Fix rest of testsKamil Trzcinski2015-10-052-8/+6
| | | |
| * | | Fix build pipeliningKamil Trzcinski2015-10-052-2/+13
| | | |
| * | | Fix next bunch of testsKamil Trzcinski2015-10-052-2/+9
| | | |
| * | | Fix triggers specKamil Trzcinski2015-10-051-3/+7
| | | |
| * | | Fix next round of testsKamil Trzcinski2015-10-058-46/+30
| | | |
| * | | Fix builds_without_retryKamil Trzcinski2015-10-053-13/+10
| | | |
| * | | Make commit_spec runKamil Trzcinski2015-10-056-67/+69
| | | |
| * | | Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-056-22/+11
| | | |
| * | | Refactor commit and buildKamil Trzcinski2015-10-0525-186/+163
| | | |
* | | | Merge branch 'fix-referer-origin' into 'master' Patricio Cano2015-10-051-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix referals for :back and relative URL installs. `app/views/layouts/_head.html.haml` currently sets the referrer policy to "origin". This disables the use of `{ redirect_to :back }`, which is used frequently throughout GitLab, and also breaks relative URL installs for browsers that obey this policy (e.g., Chrome). For example, using the "origin" policy the "Save Changes" button on the profile screen will (a) dump you at the GitLab home screen (which I can confirm on GitLab.com) or (b) dump you out of GitLab entirely for a relative URL install (which I can confirm on my local install). The right policy is "origin-when-cross-origin", which disables HTTP_REFERER when coming from other sites but enables it internally. (https://w3c.github.io/webappsec-referrer-policy/) I can confirm that this fixes the problems with ":back" on my install. See merge request !1505
| * | | Fix referals for :back and relative URL installs.Geoffrey Challen2015-10-031-1/+1
| | | |
* | | | Merge branch 'revert-layout-changes' into 'master' Dmitriy Zaporozhets2015-10-055-36/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'projects' into 'master'" This reverts commit 2b493695a39cd4e30e92cf7830e33f2f126cb30a, reversing changes made to b5c12f742ab7431257cc685477d3be16c8cc5f0e. This reverts !1487 MR because it cause bugs on mobile devices cc @skyruler See merge request !1509
| * | | Revert "Merge branch 'projects' into 'master' "revert-layout-changesDmitriy Zaporozhets2015-10-055-36/+4
| | |/ | |/| | | | | | | | | | This reverts commit 2b493695a39cd4e30e92cf7830e33f2f126cb30a, reversing changes made to b5c12f742ab7431257cc685477d3be16c8cc5f0e.
* | | Merge branch 'ci-web-hooks'Dmitriy Zaporozhets2015-10-055-63/+55
|\ \ \
| * | | CI web hooks menu active state and consitent titleci-web-hooksDmitriy Zaporozhets2015-10-052-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-055-62/+54
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix anchors to comments in diffsValery Sizov2015-10-051-0/+7
|/ /
* | Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-0321-81/+100
|\ \ | |/
| * Merge branch 'fix-cache-key-expiration-for-commits' into 'master' Dmitriy Zaporozhets2015-10-032-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 namespaceStan Hu2015-10-021-1/+1
| | |
| | * Fix bug where transferring a project would result in stale commit linksStan Hu2015-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Zaporozhets2015-10-035-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.scssprojectsAndrey2015-10-021-6/+0
| | |
| | * max height to layout.scssAndrey2015-10-021-0/+6
| | |
| | * section and .content now in layout.csscAndrey2015-10-022-11/+10
| | |
| | * CSS markup fixedAndrey2015-10-025-38/+30
| | | | | | | | | | | | | | | Everything is fixed according DZ comments. Added a bit sexy transition for our project buttons ><
| | * css aligningAndrey2015-10-011-1/+0
| | |
| | * content block height fixAndrey2015-10-012-3/+45
| | |
| * | Merge remote-tracking branch 'public/hide_services_password'Dmitriy Zaporozhets2015-10-022-3/+8
| |\ \
| | * | Hide password in the service settings formhide_services_passwordValery Sizov2015-10-022-3/+8
| | | |
| * | | Merge branch 'access_level_badge_bug' into 'master' Dmitriy Zaporozhets2015-10-022-3/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_bugValery Sizov2015-10-022-3/+7
| | | | |
| * | | | Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-023-17/+29
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Throttle "Forgot your password?" emails Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611 See merge request !1476
| | * | | Refactor PasswordsController to use before_actionsRobert Speicher2015-10-011-21/+21
| | | | |
| | * | | Add User#recently_sent_password_reset?Robert Speicher2015-10-011-0/+4
| | | | |
| | * | | Autofocus the email field on the password reset formRobert Speicher2015-09-301-1/+1
| | | | |
| | * | | Only allow password reset emails once per minuteRobert Speicher2015-09-301-7/+15
| | | | | | | | | | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611
| * | | | Merge branch 'ensure-ci-project' into 'master' Dmitriy Zaporozhets2015-10-025-52/+14
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Remove unnecessary fork ci logicDmitriy Zaporozhets2015-10-023-46/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Prevent creating 2 Ci::Project entities when enable CIDmitriy Zaporozhets2015-10-022-6/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status