Commit Graph
10099 Commits
Author SHA1 Message Date
Stan Hu 5aa142212f Fix Drone CI service template not saving properly
Closes #3419
2015-11-10 10:52:45 -08:00
Robert Speicher afcced01e5 Remove text-rendering property
Closes #3220

[ci skip]
2015-11-10 13:15:18 -05:00
Dmitriy Zaporozhets 9b5d275320 Merge branch 'improve-ci-graphs' 2015-11-10 18:52:50 +01:00
Dmitriy Zaporozhets 8ecc6f94cb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-10 18:43:33 +01:00
Dmitriy Zaporozhets 316dd9c8d6 Merge pull request #9819 from huacnlee/do-not-use-coffeescript-in-view
Replace CoffeeScript block into JavaScript in Views.
2015-11-10 18:33:11 +01:00
Dmitriy Zaporozhets 802b8fceb4 Fix graph description and text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10 16:27:50 +01:00
Stan Hu 99c05363ea Remove CSS property preventing hard tabs from rendering in Chromium 45
This is to workaround a bug in Chromium 45 (https://code.google.com/p/chromium/issues/detail?id=446434),
which is the default browser in Ubuntu 14.04 and older.

Closes #3220
2015-11-10 07:19:31 -08:00
Dmitriy Zaporozhets 7181fdd23e Merge branch 'issue_3072_target_name' into 'master'
Display target branch on MR list when it is different from project's default

Fixes #3072

The screenshot below shows both previous and current UI state:

![branch-mr-both](/uploads/5c1f0519e42bae4655f3eee37edfc356/branch-mr-both.png)

First merge request has default branch as a target, second one has non default branch as target.

See merge request !1741
2015-11-10 12:28:45 +00:00
Jason Lee 18cb430f79 Replace CoffeeScript block into JavaScript in Views.
For example view: shared/issuable/_context

CoffeeScript: 190ms
JavaScript: 19.7ms
2015-11-10 19:17:37 +08:00
Dmitriy Zaporozhets 1b7a2fc536 Improve Continuous Integration graphs page
* fix commit duration graph
* make graphs responsive
* fix wrong padding
* add a bit of explanation to colors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10 11:49:38 +01:00
Dmitriy Zaporozhets 354b69dde2 Merge remote-tracking branch 'origin/release-notes'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10 10:20:22 +01:00
Anton Baklanov 746e49fee9 Display target branch on MR list when it is different from project's default 2015-11-10 09:31:14 +02:00
Dmitriy Zaporozhets 4ec51b34d7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-09 18:39:21 +01:00
Dmitriy Zaporozhets 62769e2050 Merge branch 'accept_mr_btn_ci_status' into 'master'
Merge button has color from CI status

This MR closes #3313

I'am not realy sure about the color for the skipped status (red)...

UI changes:

![accpet-mr-ci-failed](/uploads/c03970c468b89e38ed2c5e3171f53505/accpet-mr-ci-failed.png)

![accpet-mr-ci-skipped](/uploads/f29cbc69e77cc95b33522135b327cc51/accpet-mr-ci-skipped.png)

![accpet-mr-ci-pending](/uploads/79612a66fd497174e00bd348c9cba69c/accpet-mr-ci-pending.png)

![accpet-mr-ci-success](/uploads/4b601e6d02b860db5ff53c47c98f3206/accpet-mr-ci-success.png)


See merge request !1761
2015-11-09 15:54:28 +00:00
Dmitriy Zaporozhets b7619dad52 Add missing param and title for tag
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-09 15:39:18 +01:00
Dmitriy Zaporozhets b67fdfff3c Refactor release code a bit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-09 15:30:50 +01:00
Yorick Peterse 7f9f07023b Truncate transaction paths to 70 characters
This ensures that long URLs don't completely mess up the layout of the
table.
2015-11-09 14:29:10 +01:00
Yorick Peterse 7b5fd8742e Track the amount of times views are rendered 2015-11-09 14:29:10 +01:00
Yorick Peterse cdaa97443e Added navigation link to Sherlock 2015-11-09 14:29:10 +01:00
Yorick Peterse dec3e4ce64 Added Sherlock, a custom profiling tool for GitLab
Sherlock will be a new GitLab specific tool for measuring the
performance of Rails requests (and SideKiq jobs at some point). Some of
the things that are currently tracked:

* SQL queries along with their timings, backtraces and query plans
  (using "EXPLAIN ANALYZE" for PostgreSQL and regular "EXPLAIN" for
  MySQL)
* Timings of application files (including views) on a per line basis
* Some meta data such as the request method, path, total duration, etc

More tracking (e.g. Rugged or gitlab-shell timings) might be added in
the future.

Sherlock will replace any existing tools we have used so far (e.g.
active_record_query_trace and rack-mini-profiler), hence the
corresponding Gems have been removed from the Gemfile.

Sherlock can be enabled by starting Rails as following:

    ENABLE_SHERLOCK=1 bundle exec rails s

Recorded transactions can be found at `/sherlock/transactions`.
2015-11-09 14:29:10 +01:00
Dmitriy Zaporozhets 8597e885b5 Merge pull request #9814 from Totof6942/patch-ui-graphs-header
Apply new header design for project graphs page
2015-11-09 13:42:08 +01:00
Dmitriy Zaporozhets bd54bf7a79 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-09 13:39:52 +01:00
Douwe Maan 03b12ee550 Merge branch 'fix-commits-manual-merge' into 'master'
Fix bug where manually merged branches in a MR would end up with an empty diff

This bug manifested in 8.1 with the refactoring of `RefreshService`. Here's what happens:

1. User create a new branch `foo`.
2. User creates a merge request for `foo`.
3. User merges `foo` into `master` by hand.
4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff.
5. `RefreshService` then closes the MR.

This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens.

Closes #3314

See merge request !1758
2015-11-09 11:12:42 +00:00
Kamil Trzciński 9f05512647 Merge branch 'shared_runners' into 'master'
Enable shared runners for all new projects

This adds Admin Setting option to enable shared runners for all new projects, and by default it is set to true.

/cc @dzaporozhets @sytses 


See merge request !1738
2015-11-09 09:41:07 +00:00
Sullivan SENECHALandSullivan SENECHAL 3727c9cab2 Add GitLabCI code coverage regex sample for PHPUnit 2015-11-09 10:02:50 +01:00
Christophe Poulette 4ac26c6463 Fix typo. 2015-11-08 20:31:55 +01:00
Christophe Poulette b68a2e6f25 Fix typo 2015-11-08 20:15:58 +01:00
Christophe Poulette ac5b6c3b50 Apply new design for project graphs page 2015-11-08 19:30:18 +01:00
Achilleas Pipinellis b8cd6f9aae Update piwik template 2015-11-08 18:03:30 +02:00
Dmitriy Zaporozhets 4099751ce9 Render same markdown hint for issue, merge request, wiki and comment forms
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-07 20:22:16 +01:00
Christian Speich b14198a5e7 Hide tab-bar in login-box when only one tabs is shown. 2015-11-07 12:40:14 +01:00
Dmitriy Zaporozhets 0d9fb211f3 Merge branch 'small-ui-improvements' into 'master'
Small UI improvements to merge request page

Make gray block under tabs identical height. Also same height have blocks on pages like `Groups` etc. So this improvement is targeted for consistency in UI too

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

Fixes internal issues 

* https://dev.gitlab.org/gitlab/gitlabhq/issues/2591
* https://dev.gitlab.org/gitlab/gitlabhq/issues/2592

cc @DouweM 


See merge request !1759
2015-11-07 10:43:00 +00:00
Baldinof e34904370f Merge button has color from CI status 2015-11-06 23:45:33 +01:00
Dmitriy Zaporozhets c5ec2a23a4 Small UI improvements to merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-06 16:27:18 +01:00
Dmitriy Zaporozhets 14518ba65a Better english
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-06 15:48:18 +01:00
Dmitriy Zaporozhets 6f15356aea Add tests to release notes feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-06 15:43:59 +01:00
Dmitriy Zaporozhets cb8b9c3fe2 Add association and validation for Release model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-06 15:29:04 +01:00
Dmitriy Zaporozhets 962b57df5a Small UI improvements to new git tag page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-06 15:05:19 +01:00
Dmitriy Zaporozhets c1a893d91a Fix list rendering issue when dropdown was hidden in row
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-06 14:44:46 +01:00
Dmitriy Zaporozhets cea2afa85e Add changelog item and remove release labels for tags list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-06 14:15:27 +01:00
Dmitriy Zaporozhets b0cb03cd8f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-06 14:05:12 +01:00
Dmitriy Zaporozhets f566e6889c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-11-06 14:05:08 +01:00
Dmitriy Zaporozhets 2765aed62c Merge pull request #9730 from ImanMh/master
ugly outlines removed form sidebar
2015-11-06 14:04:18 +01:00
Dmitriy Zaporozhets 6617094ea2 Merge pull request #9788 from Thirumal-Sakthivel/select_box_ui
form-control class added to select box
2015-11-06 14:03:32 +01:00
Stan Hu 40a9b1ce00 Fix bug where manually merged branches in a MR would end up with an empty diff
Closes #3314
2015-11-05 23:47:04 -08:00
Sytse Sijbrandij c468461579 Only have one link in emails to make clicking it easier. 2015-11-05 21:17:15 -08:00
Dmitriy Zaporozhets 3c0244d3d1 Retyle tag show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-05 18:37:31 +01:00
Dmitriy Zaporozhets 900419c43c Improve UI for tags page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-05 17:08:47 +01:00
Kamil Trzcinski b18671a1b2 Enable shared runners for all new projects 2015-11-05 17:02:02 +01:00
Thirumal S 6fcd5127a3 defined class prepend-top-10 used for alignment issue 2015-11-05 20:21:46 +05:30