home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,611 Commits 48 Branches 340 Tags
3be20afa9f7bfb4e4d13b30d5cfcd304b79ea478
Commit Graph
1482 Commits
Author SHA1 Message Date
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
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
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
Robert Speicher c04e22fba8 Merge branch 'saml-decoupling' into 'master' 
Decouple SAML authentication from the default Omniauth logic

Fixes gitlab-org/gitlab-ee#178

With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118

See merge request !2782
 2016-02-18 19:46:35 +00:00
Richard Pidgeon 5d2530f069 bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this 2016-02-18 18:58:51 +00:00
Patricio Cano f014127e17 Decouple SAML authentication from the default Omniauth logic 2016-02-18 13:22:19 -05:00
Jacob Vosmaer 9805fe1914 Use SCAN during 'rake cache:clear' 
This allows 'rake cache:clear' to delete millions of keys without
choking. It requires Redis 2.8.0 or newer but we needed that already
anyway.
 2016-02-18 16:55:19 +01:00
Robert Speicher 6c9ae675b5 Add release tracking for Sentry 2016-02-17 14:05:58 -05:00
Robert Speicher fe13f58f3e Update Emoji asset path 
Now that we're serving assets directly from the Gemojione gem's path,
the images are not in an `emoji/` sub-folder.
 2016-02-12 15:34:20 -05:00
Grzegorz Bizon 28b11963b1 Move builds badge implementation to new badges controller 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 7e1453f2f0 Fix rubocop offence in routes for build badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 52352dccc3 Move badge implementation to builds controller 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 442a49db2b Skip authentication when requesting commit status badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 28c4c949a5 Improve CI status badge implementation 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 14f928b730 Add CI status badge implementation to commit controller 2016-02-11 10:29:14 +01:00
Achilleas Pipinellis 10aa99a30c Merge branch 'doc_relative_url' into 'master' 
Add documentation on relative URL support

closes #12773

See merge request !2770
 2016-02-10 10:51:18 +00:00
Achilleas Pipinellis 464cea7d48 Fix typos and grammar 
[ci skip]
 2016-02-10 12:43:19 +02:00
Dmitriy Zaporozhets 22808a2221 Merge branch 'fix-explore-filter' into 'master' 
Add ajax filtering to all paged project lists. Fixes #13182



See merge request !2728
 2016-02-10 08:31:36 +00:00
Robert Speicher 4317b22741 Merge branch 'variables-build-log' into 'master' 
Add notice about variables in build log

Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942

[ci skip]

See merge request !2761
 2016-02-09 21:34:46 +00:00
Douwe Maan d77c3cff36 Merge pull request #10023 from bozaro/smtp-port 
Change default smpt port to 465 (default smtps port)
 2016-02-09 17:22:47 +01:00
Josh Frye 8b4e9720d9 Extract events rendering to own action. 2016-02-09 10:10:41 -05:00
Achilleas Pipinellis b532109b97 Edit configuration files for relative URL support 
[ci skip]
 2016-02-09 16:59:42 +02:00
Artem V. Navrotskiy e080fdad6e Change default smpt port to 465 (default smtps port) 2016-02-09 07:30:06 +03:00
Kamil Trzcinski 4558bb1f4a Filter out variables from production logs 
This prevents leakage of CI Secure Variables
 2016-02-09 00:44:27 +01:00
Robert Speicher 89b3ddd609 Allow limited Markdown in Broadcast Messages 
Closes #11853
 2016-02-06 14:30:07 -05:00