home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,340 Commits 48 Branches 340 Tags
f3bf0fe7aca0672c406141ff88fffe623e507bdc
Commit Graph
20340 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Vito Moscaritolo f3bf0fe7ac Fix duplicate entry for 8.1.0 release 
Fix duplicate entry for 8.1.0 release and remove unreleased tag.
 2015-11-10 11:25:28 +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
Achilleas Pipinellis 2ee3f8381b Merge branch 'master' into 'master' 
Change documentation of converting a MySQL-Database to a Postgres one

The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904

closes #2904

See merge request !1549
 2015-11-10 01:52:53 +00:00
Douwe Maan 264dc3f7dd Merge branch 'stanhu/gitlab-ce-bump-gitlab-git-and-other-gems' 2015-11-09 20:27:04 +01:00
Robert Speicher 9822bce467 Update monthly release issue template 
[ci skip]
 2015-11-09 14:24:26 -05:00
Robert Speicher f526d43432 Update CHANGELOG 
[ci skip]
 2015-11-09 13:26:29 -05:00
Dmitriy Zaporozhets 4ec51b34d7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-09 18:39:21 +01:00
Robert Speicher b740bfc218 Merge branch 'fix-incoming-email-default' into 'master' 
Fix incoming email config defaults

Fixes #3377.

See merge request !1766
 2015-11-09 17:25:31 +00:00
Stan Hu 4017a4fcbc Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3. 
Switch back to github-linguist
 2015-11-09 08:17:17 -08: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
Yorick Peterse 73cf0f1647 Only load rblineprof when actually needed 
This ensures the application can still boot when the "development" group
is not available.
 2015-11-09 15:54:13 +01: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 26344c8f82 Merge branch 'sherlock' into 'master' 
See merge request !1749
 2015-11-09 13:40:26 +00:00
Yorick Peterse 68843a53e6 Added changelog entry for Sherlock 2015-11-09 14:29: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 db46d49c0e Fixed Hash key style in Sherlock::Query spec 2015-11-09 14:29:10 +01:00
Yorick Peterse 126a2428cd Updated profiling guides for Sherlock 2015-11-09 14:29:10 +01:00
Yorick Peterse 265ef867ff Added specs and source documentation for 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
Douwe Maan 0fb85939da Fix incoming email config defaults 2015-11-09 14:12:21 +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
Jeroen van Baarsen a353a87680 Merge pull request #9756 from Soullivaneuh/patch-1 
Add GitLabCI code coverage regex sample for PHPUnit
 2015-11-09 11:13:21 +01: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
Kamil Trzcinski 4fda9ef8a5 Fix tests 2015-11-08 23:55:47 +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
Jeroen van Baarsen 927df09656 Merge pull request #9813 from axilleas/fix_piwik_template 
Update piwik template
 2015-11-08 19:04:15 +01:00
Achilleas Pipinellis b8cd6f9aae Update piwik template 2015-11-08 18:03:30 +02:00
Dmitriy Zaporozhets bf76df2274 Merge branch 'markdown-form-hint' into 'master' 
Render same markdown hint for issue, merge request, wiki and comment forms

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2595

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

See merge request !1763
 2015-11-07 23:30:39 +00: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
Robert Schilling e9f3db1558 Merge pull request #9782 from gitlabhq/jvanbaarsen-patch-1 
Fixed markdown issue in PROCESS.md
 2015-11-07 16:11:49 +01:00
Jeroen van Baarsen 920a2d974c Fixed markdown issue in PROCESS.md 2015-11-07 16:04:57 +01:00
Jeroen van Baarsen 84999611d8 Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider 
Hide tab-bar in login-box when only one tabs is shown.
 2015-11-07 15:41:40 +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
Stan Hu 8f2561b193 Add spec for manual merge of merge request 2015-11-06 10:48:25 -08: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
Robert Schilling f57d59226d Merge pull request #9807 from SkySymbol/fix_line_order 
fix line order in installation docs
 2015-11-06 14:51:07 +01:00