Commit Graph
9604 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 697b34d786 Render CI statuses on commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 16:10:17 +02:00
Kamil Trzciński 59058a2543 Merge branch 'fix-ci-bugs' into 'master'
Fix CI regressions introduced by ci_commit changes

/cc @dzaporozhets 

See merge request !1518
2015-10-06 13:59:28 +00:00
Dmitriy Zaporozhets 4b8101dc47 Merge branch 'closer-ci-integration' into 'master'
Use CI commit status for merge request widget

For temporary compatibility with other services like Jenkins we ask for
CI status via AJAX request if there is no commit status in GitLab
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


cc @ayufan 

See merge request !1517
2015-10-06 11:56:22 +00:00
Kamil Trzcinski 065fe557f7 Fixed failure reading .gitlab-ci.yml 2015-10-06 12:00:15 +02:00
Kamil Trzcinski a266752821 Latest builds always include builds with unique name and unique ref 2015-10-06 11:59:55 +02:00
Dmitriy Zaporozhets e6ab50a754 Use CI commit status for merge request widget
For temporary compatibility with other services like Jenkins we ask for
CI status via AJAX request if there is no commit status in GitLab
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 10:34:36 +02:00
Kamil Trzcinski fc795d6ee2 Fix graphical glitches 2015-10-05 21:20:54 +02:00
Kamil Trzcinski e5e6c846ea Fix builds view 2015-10-05 20:21:08 +02:00
Dmitriy Zaporozhets b2803a5e05 Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 20:15:43 +02:00
Dmitriy Zaporozhets 3d90560c1e Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 20:14:32 +02:00
Kamil Trzcinski f088ffe8f7 Merge branch 'rs-remove-ci-disable'
See merge request !1512
2015-10-05 20:06:31 +02:00
Kamil Trzciński 3eef0e18e0 Merge branch 'refactor-build-service' into 'master'
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
2015-10-05 17:42:50 +00:00
Patricio Cano 97f7edf37a Merge branch 'fix-referer-origin' into 'master'
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
2015-10-05 16:45:35 +00:00
Robert Speicher fc59c45d58 Remove the option to disable CI
This option only existed to ease the CI-to-CE/EE migration process.

This commit partially reverts 8b05abe816
2015-10-05 12:23:38 -04:00
Peter Göbel 291e1fa930 improved code style and layout option naming 2015-10-05 18:09:05 +02:00
Peter Göbel e2c5d08e7e added user preference to change layout width 2015-10-05 17:22:47 +02:00
Kamil Trzcinski 97a11136d3 Fix create_trigger_request_service_spec 2015-10-05 17:06:31 +02:00
Dmitriy Zaporozhets 94dc0224e2 Merge branch 'revert-layout-changes' into 'master'
Revert "Merge branch 'projects' into 'master'"

This reverts commit 2b493695a3, reversing
changes made to b5c12f742a.

This reverts !1487 MR because it cause bugs on mobile devices 


cc @skyruler 

See merge request !1509
2015-10-05 15:05:16 +00:00
Kamil Trzcinski 29a7c6796e Fix GitLabCiService and remove ci_yaml_file from CI push data 2015-10-05 16:06:35 +02:00
Kamil Trzcinski c985389722 Add stage tests 2015-10-05 15:59:31 +02:00
Dmitriy Zaporozhets 39772f0116 Merge branch 'ci-web-hooks' 2015-10-05 15:01:40 +02:00
Kamil Trzcinski f42078f7c1 Fix rest of tests 2015-10-05 14:31:51 +02:00
Kamil Trzcinski 0367dbf043 Fix build pipelining 2015-10-05 14:15:15 +02:00
Dmitriy Zaporozhets 813c0ead2e Revert "Merge branch 'projects' into 'master' "
This reverts commit 2b493695a3, reversing
changes made to b5c12f742a.
2015-10-05 13:59:01 +02:00
Kamil Trzcinski 5064c9038c Fix next bunch of tests 2015-10-05 13:51:28 +02:00
Kamil Trzcinski 782c8f9aa0 Fix triggers spec 2015-10-05 13:37:50 +02:00
Kamil Trzcinski d2d2df0738 Fix next round of tests 2015-10-05 13:12:00 +02:00
Valery Sizov 31330e4a3c Fix anchors to comments in diffs 2015-10-05 14:00:41 +03:00
Kamil Trzcinski 361dc3641d Fix builds_without_retry 2015-10-05 12:38:00 +02:00
Kamil Trzcinski 317a746954 Make commit_spec run 2015-10-05 12:02:26 +02:00
Dmitriy Zaporozhets ecbe393b8d CI web hooks menu active state and consitent title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 10:51:25 +02:00
Dmitriy Zaporozhets c293cc9152 Move CI web hooks page to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 10:47:23 +02:00
Kamil Trzcinski e3d870d7fc Add user to Ci::Build to have pusher email address 2015-10-05 10:15:40 +02:00
Kamil Trzcinski 546a3c6561 Refactor commit and build 2015-10-05 09:52:35 +02:00
Guilherme Garnier 1cfb48ddd0 Merge remote-tracking branch 'upstream/master' 2015-10-03 11:46:29 -05:00
Geoffrey Challen 5792eb9544 Fix referals for :back and relative URL installs. 2015-10-03 08:58:31 -04:00
Dmitriy Zaporozhets 662f8af497 Merge branch 'fix-cache-key-expiration-for-commits' into 'master'
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
2015-10-03 08:45:27 +00:00
Dmitriy Zaporozhets 2b493695a3 Merge branch 'projects' into 'master'
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
2015-10-03 08:44:06 +00:00
Guilherme Garnier 2b075f16c7 Fix rubocop warnings in app 2015-10-03 00:56:37 -05:00
Stan Hu 3fbcc51102 Update README cache key to use full project namespace 2015-10-02 13:26:42 -07:00
Stan Hu dbc85bfa01 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 object pathname solves this issue.

Closes gitlab-org/omnibus-gitlab#843
2015-10-02 11:24:17 -07:00
Andrey 75c03530f8 removed max-heght from project.scss 2015-10-02 17:08:12 +02:00
Dmitriy Zaporozhets b5c12f742a Merge remote-tracking branch 'public/hide_services_password' 2015-10-02 16:48:38 +02:00
Dmitriy Zaporozhets 0e7b96bf48 Merge branch 'access_level_badge_bug' into 'master'
Fix: Wrong access level badge on MR comments

https://gitlab.com/gitlab-org/gitlab-ce/issues/2654

See merge request !1501
2015-10-02 14:39:58 +00:00
Andrey acdb5f34cf max height to layout.scss 2015-10-02 16:38:37 +02:00
Douwe Maan 93522e59ec Merge branch 'rs-throttle-reset' into 'master'
Throttle "Forgot your password?" emails

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611

See merge request !1476
2015-10-02 14:37:07 +00:00
Valery Sizov 97e6c9b42c Wrong access level badge on MR comments 2015-10-02 15:11:17 +03:00
Dmitriy Zaporozhets c7e323438e Merge branch 'ensure-ci-project' into 'master'
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
2015-10-02 10:39:31 +00:00
Andrey 5ebcf21b81 section and .content now in layout.cssc 2015-10-02 12:01:46 +02:00
Valery Sizov 731b860976 Hide password in the service settings form 2015-10-02 12:48:57 +03:00