home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,148 Commits 48 Branches 340 Tags
efde96e9cd4b0096c19ecfa46237b7eda28038aa
Commit Graph
1504 Commits
Author SHA1 Message Date
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' "" 
This reverts commit 5a586f364c
 2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' " 
This reverts merge request !3191
 2016-03-12 17:42:51 +00:00
Douwe Maan 826bc72c12 Merge branch 'support-go-subpackages' into 'master' 
Support Golang subpackage fetching

Closes #13805

See merge request !3191
 2016-03-12 17:38:08 +00:00
Douwe Maan f979b4a2c8 Merge branch 'filter-import-url' into 'master' 
Filter import_url params because they may contain auth information. Fixes #14199

cc @dzaporozhets @DouweM tagging you since this is security related.

See merge request !3174
 2016-03-12 14:08:48 +00:00
Stan Hu cc065fbeaa Support Golang subpackage fetching 
Closes #13805
 2016-03-12 01:09:37 -08:00
Douwe Maan cb81c8a5ef Merge branch 'rs-issue-12944' into 'master' 
Use a custom Devise failure app to handle unauthenticated .zip requests

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944

See merge request !2828
 2016-03-11 22:34:33 +00:00
Yorick PeterseandRobert Speicher 12082db41e Disable Rubocop for PostgreSQL patches 
This code is mostly a copy-paste from existing pull requests so there's
no point in running Rubocop on it.
 2016-03-11 15:25:23 -05:00
Yorick PeterseandRobert Speicher d38dcf1e3b Patch MySQL to ignore PostgreSQL schema options 
This ensures that options such as `using: :gin` and PostgreSQL operator
classes are ignored when loading a schema into a MySQL database.
 2016-03-11 15:25:22 -05:00
Yorick PeterseandRobert Speicher 49e122df85 Backport Rails support for PostgreSQL opclasses 
This is needed to support creating/dumping/loading indexes that use the
gin_trgm_ops operator class on PostgreSQL. These changes are taken from
Rails pull request https://github.com/rails/rails/pull/19090.
 2016-03-11 15:25:22 -05:00
Robert Speicher ee14ac68a5 Merge branch 'group-activity-separate-tab' into 'master' 
Move group activity feed to separate page for consistency with dashboard
and project pages

Fixes #14161. Part of #13480 

See merge request !3157
 2016-03-11 19:58:10 +00:00
Josh Frye 36ddca101e Filter import_url params because they may contain auth information. Fixes #14199 2016-03-10 21:22:46 -05:00
Dmitriy Zaporozhets e3efce9237 Move group activity feed to separate page for consistency with dashboard and project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-10 14:29:38 +01:00
Jacob Vosmaer c46e6eff10 Parse config/resque.yml in one place only 2016-03-09 15:16:46 +01:00
Robert Speicher 5844a21a0a Use a custom Devise failure app to handle unauthenticated .zip requests 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
 2016-03-08 23:49:30 -05:00
Robert Speicher c3eb245874 Merge branch 'remove-duplicate-cache_store-in-test-config' into 'master' 
Remove duplicate 'cache_store' configuration in test environment

[ci skip]

See merge request !3061
 2016-03-08 17:26:47 +00:00
Robert Speicher fcfdb23a23 Don't generate factories automatically 2016-03-04 15:26:51 -05:00
Robert Speicher 01b89ee8f1 Remove Profile::KeysController#new action 2016-03-03 16:13:59 -05:00
Jacob Schatz 1fa7671f44 Merge branch 'improve-user-tabs' into 'master' 
Add routes and actions for dynamic tab loading. Closes #13588 and #13584



See merge request !2961
 2016-03-03 00:13:19 +00:00
Douwe Maan 8ec49e47ec Merge branch 'mail-room-config-without-rails' into 'master' 
Don't load all of GitLab in mail_room

Fixes #12731

cc @jacobvosmaer 

See merge request !3005
 2016-03-02 10:43:57 +00:00
Rémy Coutable 9c593a51c3 Remove duplicate 'cache_store' configuration in test environment 2016-03-02 10:33:38 +00:00
Alfredo Sumaran 9f1c3bb765 Merge branch 'master' into improve-user-tabs 2016-03-01 13:37:03 -05:00
Alfredo Sumaran f0b8779047 Make url and actions to be the same name 2016-03-01 11:43:22 -05:00
Artem Sidorenko 28ba8ed5f5 Use dedicated relative_url.rb initializer 
in order to have it the same way like in omnibus
 2016-02-29 21:17:48 +01:00
Josh Frye cc9f93f9d2 Add routes and actions for dynamic tab loading 2016-02-29 08:24:07 -05:00
Douwe Maan bbdb9ba036 Don't load all of GitLab in mail_room 
Fixes #12731
 2016-02-26 18:48:13 -08:00
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE 
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
 2016-02-26 15:50:51 +01:00
Rémy Coutable bd71438d6a Merge branch 'bring-back-newrelic-gem' into 'master' 
Revert "Remove newrelic gem. Closes #12860"

This reverts commit 531767175f.

Conflicts:
	Gemfile.lock

See merge request !2943
 2016-02-24 07:25:36 +00:00
Robert Speicher dba47f680d Merge branch 'issue_13301_emoji-menu' into 'master' 
Load award emoji picker with ajax request

Fixes #13301.

See merge request !2888
 2016-02-24 02:50:45 +00:00
Stan Hu 623cd23903 Revert "Remove newrelic gem. Closes #12860" 
This reverts commit 531767175f.

Conflicts:
	Gemfile.lock
 2016-02-23 07:25:37 -08:00
Annabel Dunstone 7bb378b33d Create EmojisController 2016-02-22 20:16:00 -06:00
Patricio Cano 99edb2a0aa Properly set auto_link_saml_user default value in the Settings loader. 2016-02-22 11:59:15 -05:00
Douglas Barbosa Alexandre 2ef1ea501f Add missing route to mark all todos as done 2016-02-21 12:57:12 -03:00
Douglas Barbosa Alexandre 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre 77d7910b8b Allow user to mark each task as done manually 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 7cafa2ce92 Add tasks queue list page 2016-02-20 12:10:26 -02:00
Rubén DávilaandRobert Speicher 9d4c105ab0 Remove code introduced when endpoint was in MR controller. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 006089f972 Add new endpoint and button to revert any commit. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher d3c2437328 Add new endpoint and button to revert merge. #3409 2016-02-19 13:14:48 -05:00
Grzegorz Bizon 7d5a182624 Use POST method instead of DELETE when erasing a build 
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042
 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 73faddedbf Change build erase path to make it consistent with API 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 21152d7d51 Use DELETE verb for erasing a build content 
Also added API specs for that
 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon c8102d938b Add build eraseable feature implementation 2016-02-19 17:24:03 +01:00
Patricio Cano 75ad91822d Merge branch 'saml-decoupling' into 'master' 2016-02-19 10:41:54 -05:00
Douwe Maan ad12f11f3e Merge branch 'rs-emoji' into 'master' 
Update Gemojione for new hotness ✨

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
 2016-02-19 08:11:02 +00:00
Douwe Maan 48467d3072 Document true/false as supported value. 2016-02-19 07:43:00 +00:00
Annabel Dunstone 074fa8f2b9 Load award emoji picker with ajax request 2016-02-18 22:02:22 -06:00
Patricio Cano 06376be56a Decouple SAML authentication from the default Omniauth logic 2016-02-18 17:01:07 -05:00
Robert Speicher ea4d2741a2 Merge branch 'patch-1' into 'master' 
Bug found by Charles Sibbald at Sky.

Calls with patricio and Jacob confirmed this.

[ci skip]

See merge request !2877
 2016-02-18 21:52:09 +00:00
Douwe Maan 873b0db220 Revert "Merge branch 'saml-decoupling' into 'master' " 
This reverts commit c04e22fba8, reversing
changes made to 0feab326d5.
 2016-02-18 22:14:53 +01:00
Douwe Maan 6524fbeaba Merge branch 'rs-sentry-release-tracking' into 'master' 
Add release tracking for Sentry



See merge request !2863
 2016-02-18 21:10:35 +00:00