summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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 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>
| | * | | Ensure GitLab CI project exists when CI service is activated manuallyensure-ci-projectDmitriy Zaporozhets2015-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'add_last_push_widget' into 'master' Dmitriy Zaporozhets2015-10-022-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add last push widget to starred projects dashboard This adds the last push widget to the starred projects dashboard. If a user set the starred projects dashboard as their preferred dashboard they would not see last push widget. The look is seamless between starred and 'your projects' dashboards. ### Screenshot: ![Screen_Shot_2015-10-01_at_3.15.52_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2f5dcf49c3d0186bdd05bb6788b143f1/Screen_Shot_2015-10-01_at_3.15.52_PM.png) See merge request !1304
| | * | | | Add last push widget to starred projects dashboardDrew Blessing2015-10-012-0/+4
| | | | | |
* | | | | | Fix rubocop warnings in appGuilherme Garnier2015-10-0314-42/+29
|/ / / / /
* | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqStan Hu2015-10-011-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9684 from NKMR6194/masterStan Hu2015-10-011-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Fix link with emoji
| | * | | | Fix link with emojiSAKATA Sinji2015-10-021-1/+1
| | | | | |
* | | | | | Merge branch 'rs-update-note' into 'master'Robert Speicher2015-10-013-9/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Ensure updated notes are syntax highlighted See merge request !1444
| * | | | | Simplify Note#editable?rs-update-noteRobert Speicher2015-09-301-1/+1
| | | | | |
| * | | | | Ensure notes are highlighted properly when they're updatedRobert Speicher2015-09-301-7/+9
| | | | | |
| * | | | | Don't render the edit_form view for system notesRobert Speicher2015-09-301-1/+3
| | |/ / / | |/| | |
* | | | | Remove email footer textZeger-Jan van de Weg2015-10-011-2/+0
| |/ / / |/| | |
* | | | Merge branch 'show-diff-stats-for-mr'Dmitriy Zaporozhets2015-10-012-19/+17
|\ \ \ \
| * | | | Avoid unnecessary usage of local varsshow-diff-stats-for-mrDmitriy Zaporozhets2015-10-012-6/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-012-19/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-email-typo' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notify: fix typo in merged_merge_request_email template All (two) other templates with this line use 'url' rather than 'Url'. See merge request !1151
| * | | | | notify: fix typo in merged_merge_request_email templateBen Boeckel2015-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | All (two) other templates with this line use 'url' rather than 'Url'.
* | | | | | Merge branch 'fix-visit-project-button' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Visit project on GitLab button goes to The internal Gitlab project Since we are merging CI into CE, projects should go to the internal Projects page, we can also use Turbolinks to do so. In order to give the user an idea of integration, I renamed the button: "Go to Project" ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/e4134716680e37b3211c3b5fd6118d1e/image.png) See merge request !1344
View Lorry Controller Status