home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,387 Commits 48 Branches 340 Tags
74e1add2fcbd47ec748e04c65d3eb947dba73cf2
Commit Graph
23387 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 74e1add2fc Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master' 
Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""

This reverts commit b0145d765b.

See merge request !2642
 2016-01-29 09:40:18 +00:00
Marin Jankovski 9d0065f054 Merge branch 'hotfix/ruby-21-broken-update' into 'master' 
fix syntax error on 2.1 and rubocop on 2.2

Background:

Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... 

We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`.

Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. 

Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801

See merge request !2637
 2016-01-29 08:12:18 +00:00
Sytse Sijbrandij 92c04ecbd7 Make changes in config/initializers/1_settings.rb 2016-01-28 17:06:21 -08:00
Robert Speicher 2b1ddb0f80 Merge branch 'mr-merge-base' into 'master' 
Correctly determine MR diff base when MR has merge conflicts

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779

See merge request !2632
 2016-01-28 21:08:41 +00:00
James Lopez 6e4d36b49d add back master only for ruby 2.1 images 2016-01-28 21:54:45 +01:00
Robert Speicher 0e79b5f396 Merge branch 'highlight-blame' into 'master' 
Fix highlighting in blame view.

See merge request !2630
 2016-01-28 20:30:21 +00:00
Robert Speicher 79123ec998 Revert "Revert "Remove the :coffee and :coffeescript Haml filters"" 
This reverts commit b0145d765b.
 2016-01-28 14:29:09 -05:00
Robert Speicher 789e048352 Merge branch 'rs-ldap-user' into 'master' 
Backport LDAP user assignment changes from EE

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

See merge request !2641
 2016-01-28 19:09:52 +00:00
Robert Speicher f673401c03 Merge branch 'update_sentry_gem' into 'master' 
Update sentry-raven gem.

Should resolve `fatal: Not a git repository (or any of the parent directories): .git` warnings.

Fixes #12657

See merge request !2636
 2016-01-28 18:43:40 +00:00
Robert Speicher 1e666ce695 Backport LDAP user assignment changes from EE 
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
 2016-01-28 13:31:48 -05:00
James Lopez 69c4e0a119 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-broken-update 2016-01-28 18:14:28 +01:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master' 
Show list of forks for a given Project

Closes #2406

See merge request !2376
 2016-01-28 16:58:38 +00:00
Dmitriy Zaporozhets 3f6bb7bc86 Merge branch 'issue_5546' into 'master' 
Save list sort in a cookie

Closes #5546 

See merge request !2537
 2016-01-28 16:21:04 +00:00
Dmitriy Zaporozhets ee8884c68e Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into 'master' 
Fix preventing migration from crashing in very specific cases

Closes #12606. Closes #12501.

/cc @yorickpeterse @dbalexandre 

See merge request !2600
 2016-01-28 15:20:14 +00:00
Dmitriy Zaporozhets ef42af9a8a Merge branch 'improve-mr-api' into 'master' 
Improve consistency and duplication for Merge Request API

* Follow REST for merge request API route
* Remove repeating comments API for MR

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

Fixes #4759 and #11810 

See merge request !2639
 2016-01-28 14:50:03 +00:00
Douwe Maan b7ec476205 Merge branch 'master' into mr-merge-base 2016-01-28 15:12:24 +01:00
Jacob Schatz 695fb209b7 Merge branch 'sort-text-removed-from-sort-dropdown' into 'master' 
Removed sorted text from dropdowns

![Screen_Shot_2016-01-28_at_09.04.36](/uploads/9e0e1fdb45ad12d122f860a2164d9396/Screen_Shot_2016-01-28_at_09.04.36.png)

Closes #12796 

cc @creamzy @jschatz1 

See merge request !2635
 2016-01-28 14:11:05 +00:00
Douwe Maan 30b0d06e9f Fix specs 2016-01-28 15:10:48 +01:00
Douwe Maan 7d07091c6c Fix changelog 2016-01-28 14:49:53 +01:00
Douwe Maan 590e237d55 Merge branch 'master' into highlight-blame 2016-01-28 14:49:34 +01:00
Douwe Maan b636f83e59 Move blame group logic to dedicated class 2016-01-28 14:49:21 +01:00
Dmitriy Zaporozhets dfb8803c1c Improve consistency and duplication for Merge Request API 
* Follow REST for merge request API route
* Remove repeating comments API for MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-28 14:26:12 +01:00
Dmitriy Zaporozhets 9bf47f06ab Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master' 
Makes ol margin big enough for 3 digits.

Fixes #7960 

![Screen_Shot_2016-01-25_at_11.20.03_PM](/uploads/73c4b9e939fe108fb3b8221e16e686bd/Screen_Shot_2016-01-25_at_11.20.03_PM.png)


See merge request !2608
 2016-01-28 13:07:26 +00:00
Dmitriy Zaporozhets 6748520de6 Merge branch 'feature/jschatz1/instant-issuable-history' into 'master' 
Adds feature: Ajax Close/Open updates discussion automatically

Triggers jQuery event <br/>
Fixes #5544

See merge request !2610
 2016-01-28 13:05:50 +00:00
Rémy Coutable 55ab92c00b Use ActiveRecord::Base.connection.active? and rescue any exception in connect_to_db? 
This ensures that rake tasks that don't need a DB connection can be run
without one.
 2016-01-28 12:23:37 +01:00
James Lopez 902baa2e1c trick rubocop and temporarily add ruby 2.1 images for any branch 2016-01-28 11:41:58 +01:00
Rémy Coutable 869b4d7c6a Only create the defaults ApplicationSetting when DB is fully migrated 
Return a fake application settings OpenStruct when this is not the case.
Also, use ActiveRecord::Base.connection_pool.active_connection? instead
of ActiveRecord::Base.connection.active? to avoid driver exception.
 2016-01-28 11:26:28 +01:00
Marin Jankovski 34a12e8cf9 Update sentry-raven gem. 2016-01-28 10:37:20 +01:00
Phil Hughes 22e81f5dbe Removed sorted text from dropdowns 
Closes #12796
 2016-01-28 09:06:20 +00:00
Robert Speicher ca171b8190 Update gitlab-workhorse versions in documentation 
[ci skip]
 2016-01-27 18:30:36 -05:00
Robert Speicher 716892b4fd Update CHANGELOG 
[ci skip]
 2016-01-27 17:48:52 -05:00
Douwe Maan f025f80d5c Merge branch 'update-ruby-2.2.4' into 'master' 
Update Ruby version to 2.2.4 (latest previous stable) and update docs

Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade. 

Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340

See merge request !2534
 2016-01-27 21:39:08 +00:00
Robert Speicher bba7e786a6 Merge branch 'events-performance' into 'master' 
Improve performance of retrieving last update times for events

See 75195eefcca4cb3961986c90c8e837da02f30134 and
https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317
for the juicy details.

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415

See merge request !2613
 2016-01-27 21:20:16 +00:00
Robert Speicher 614025da38 Merge branch 'rs-skip-2fa-on-signout' into 'master' 
Skip the 2FA requirement during logout

See merge request !2581
 2016-01-27 21:17:31 +00:00
Robert Speicher 8c6231d184 Update CHANGELOG 
[ci skip]
 2016-01-27 16:15:49 -05:00
Robert Speicher 27893b972d Merge branch 'diff-colors' into 'master' 
Increase contrast between highlighted code comments and inline diff marker.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12737.

It was especially bad in Monokai, better now.

See merge request !2629
 2016-01-27 20:59:27 +00:00
Robert Speicher 40403c78ef Merge branch 'fix-ci-runners-version-update' into 'master' 
Fix CI runner version not being properly updated when asked for a build

Due to broken implementation of attribute_for_keys the runner information was not updated correctly.

This MR adds test to check that such scenario will never happen again.

See merge request !2618
 2016-01-27 20:50:24 +00:00
Rubén Dávila 0ee875f961 Align filter dropdown. 2016-01-27 15:21:27 -05:00
Robert Speicher 56538f9cc1 Merge branch 'fix/unexistent-group-500' into 'master' 
Return a 404 instead of a 500 when accessing a non-existent group

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3352

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5600

See merge request !2614
 2016-01-27 20:19:35 +00:00
Dmitriy Zaporozhets 4dea268215 Merge branch 'rs-require-jquery-ui' into 'master' 
Limit jquery-ui requires to what we actually use



See merge request !2274
 2016-01-27 19:14:20 +00:00
Dmitriy Zaporozhets 7e6da7b91a Merge branch 'rs-2fa-requirement-wording' into 'master' 
Update wording for 2FA requirement notice



See merge request !2582
 2016-01-27 19:04:44 +00:00
Dmitriy Zaporozhets 48b6b0a446 Merge branch 'rs-issue-12672' into 'master' 
Remove link from system hook

Closes #12672

See merge request !2588
 2016-01-27 18:45:51 +00:00
Dmitriy Zaporozhets 5e48c1b851 Merge branch 'rs-bump-octokit' into 'master' 
Bump octokit to `~> 3.8.0`

Closes #2877

See merge request !2536
 2016-01-27 17:20:21 +00:00
Douwe Maan 5cce1278ad Correctly determine MR diff base when MR has merge conflicts 2016-01-27 17:23:59 +01:00
Douwe Maan 1226d16675 Merge branch 'hot-reloading' into 'master' 
Fix hot reloading for CI API



See merge request !2617
 2016-01-27 15:26:59 +00:00
James Lopez 47e0d6b162 updated README to include Ruby 2.1 2016-01-27 16:19:16 +01:00
James Lopez e862af9537 merge spec and spinach jobs 2016-01-27 16:16:03 +01:00
Douwe Maan 4be80f8aa3 Fix highlighting in blame view. 2016-01-27 16:15:24 +01:00
Douwe Maan 606f8e9190 Increase contrast between highlighted code comments and inline diff marker. 2016-01-27 16:08:42 +01:00
James Lopez 683770f35d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4 2016-01-27 15:42:35 +01:00