home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan f0b78a8529 Clarify EmailsOnPushService options. 2015-02-25 16:40:48 +01:00
Philippe Lafoucrière 183f521079 Bump gemnasium service gem 2015-02-25 10:14:10 -05:00
Douwe Maan 969de4c15a Fix EmailsOnPush to allow sending from @company.com for GitLab at gitlab.corp.company.com. 2015-02-25 15:51:13 +01:00
Douwe Maan 00c631573f Fix Gitorious import status page hiding of already added projects. 2015-02-25 15:16:24 +01:00
Douwe Maan 5d86332153 Send EmailsOnPush when deleting commits using force push. 
See #1924.
 2015-02-25 15:12:19 +01:00
Douwe Maan 769f137a53 Wrap commit message in EmailsOnPush email. 
See #1867.
 2015-02-25 14:37:15 +01:00
Douwe Maan ae70a80fc2 Fix links in EmailsOnPush text version. 2015-02-25 14:32:55 +01:00
Douwe Maan 85af3e82bf Add option to disable code diffs to EmailOnPush. 
See #1950
 2015-02-25 14:29:49 +01:00
Douwe Maan e0c186c357 Add option to send EmailsOnPush from committer email if domain matches. 
See #1809.
 2015-02-25 14:20:35 +01:00
Douwe Maan 0e7d1fd44f Add optional title field to service properties. 2015-02-25 14:05:03 +01:00
Douwe Maan 7b34c9dc59 Add list of changed files to EmailsOnPush. 
See #1906.
 2015-02-25 13:40:05 +01:00
Douwe Maan 6afb03ee96 Remove incorrect footer from EmailsOnPush body. 
See #1754.
 2015-02-25 13:13:46 +01:00
Douwe Maan 607f0c05fe Change EmailsOnPush subject to include namespace, repo and branch. 
See #1827.
 2015-02-25 13:13:27 +01:00
Douwe Maan 87da9185ff Autosave title and description of new issues/MRs. 2015-02-25 12:52:37 +01:00
Douwe Maan 5f7a3e1bbd Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/controllers/files_controller.rb
 2015-02-25 11:59:25 +01:00
Valery Sizov 9c6f048795 Fix GitLab importer. Hide already imported projects 2015-02-25 12:18:15 +02:00
Douwe Maan 9b8d5c4ab4 Make test element selection more specific. 2015-02-25 11:01:50 +01:00
Dmitriy Zaporozhets a30a56634d Merge branch 'refactor-header' into 'master' 
UI: refactor header css

See merge request !1591
 2015-02-25 07:56:28 +00:00
Dmitriy Zaporozhets 878e86bf64 Remove unnecessary theme_type from body class 2015-02-24 23:26:32 -08:00
Dmitriy Zaporozhets ee343661e1 Get rid of black logo 2015-02-24 23:17:11 -08:00
Dmitriy Zaporozhets 6e559be6c6 Refactor header logo and setup expectation on it size 2015-02-24 22:58:47 -08:00
Dmitriy Zaporozhets 5b7747bd9d Merge branch 'affix-sidebar' into 'master' 
Improve admin projects and users pages for mobile devices

See merge request !1590
 2015-02-25 06:20:26 +00:00
Dmitriy Zaporozhets 1faf3676aa Refactor gitlab themes css 2015-02-24 22:19:14 -08:00
Dmitriy Zaporozhets 6fe057cc7b Fix header avatar size 2015-02-24 21:40:47 -08:00
Dmitriy Zaporozhets f43c0429c2 Improve admin projects and users pages for mobile devices 2015-02-24 21:31:54 -08:00
Marin Jankovski 82483f9536 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-24 16:54:26 -08:00
Marin Jankovski 4aeb916566 Update changelog for 7.8.1 2015-02-24 16:53:59 -08:00
Dmitriy Zaporozhets 2cd2543c44 Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master' 
Give last_activity_at a default value so it will always be set

For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345

See merge request !1589
 2015-02-24 23:15:04 +00:00
Douwe Maan 56f51bed6b Expand Bitbucket integration docs. 2015-02-25 00:06:55 +01:00
Robert Schilling c6e9d14ceb Update version sorter to 2.0.0, fixes #8572 2015-02-24 23:20:00 +01:00
Dmitriy Zaporozhets b7dd0decf8 Merge branch 'fix-404-admin-delete' into 'master' 
Fix 404 when deleting a project from the admin section

This is some additional fallout from the rails upgrade. Need to use plural namespaces in the path function to get project deletion to go back to the project listing.

See merge request !351
 2015-02-24 21:18:20 +00:00
Dmitriy Zaporozhets 53784fb637 Merge branch 'master' into 'master' 
Updated Gitorious import icons

See merge request !353
 2015-02-24 21:17:11 +00:00
Dmitriy Zaporozhets 2cedeb4856 Merge branch 'contributed-projects' into 'master' 
Improve contributed project and commit calendar selection.

Fixes #2024.

See merge request !1554
 2015-02-24 21:07:05 +00:00
Dmitriy Zaporozhets d73a058941 Merge branch 'update_grack' into 'master' 
Update gitlab-grack to 2.0.0.rc2

See merge request !1585
 2015-02-24 20:58:19 +00:00
Dmitriy Zaporozhets 037a981017 Merge branch 'sidebar_state_toggle' into 'master' 
Toggle sidebar button more obvious

The toggle is now at the top of the sidebar because it is not noticeable
near the bottom. By placing it at the top, users will immediately know that
they can have more space if they desire versus on the bottom, they will have
to search for it and that's not desired.

Fixes #2044

See merge request !1579
 2015-02-24 20:49:31 +00:00
Dmitriy Zaporozhets ecb12f2111 Merge branch 'master' into update_grack 
Conflicts:
	Gemfile.lock
 2015-02-24 11:51:08 -08:00
Dmitriy Zaporozhets 75048fcd69 Revert "Update charlock_holmes to 0.7.3" 
This reverts commit c217860ae7.
 2015-02-24 11:46:42 -08:00
Dmitriy Zaporozhets 7bcf1c0044 Merge branch 'gitlab_linguist_update' into 'master' 
Update gitlab-linguist

Closes #1859

See merge request !1588
 2015-02-24 19:39:51 +00:00
Dmitriy Zaporozhets 46516411ef Merge branch 'web_editor_branch' into 'master' 
Web Editor: save to new branch

Implements #1931

See merge request !1523
 2015-02-24 19:38:45 +00:00
Valery Sizov 545f12d548 update gitlab-linguist 2015-02-24 20:46:52 +02:00
Valery Sizov 53e404144c changelog && documentation 2015-02-24 20:36:11 +02:00
Sabba Petri 1e42cd2040 Added a warning class to button 
Because changing username largely affects the application, it should
not be green, but be more of a warning change, which is why it's now
orange.
 2015-02-24 10:09:38 -08:00
Sabba Petri 8bcff0f1c1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into button_changes 2015-02-24 10:07:17 -08:00
Sabba Petri 9c4337e58b Fixed tests 
Tests expected specific string capitalization for headers.
 2015-02-24 10:01:41 -08:00
Sabba Petri a33e615b47 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into small_profile_changes 2015-02-24 09:55:25 -08:00
Sabba Petri 5b6d6bbc19 Added square caret to Back to Settings button 
This was done to show difference between Open/Close toggle, which
was using the same arrow as Back to Settings button previously.
 2015-02-24 09:42:35 -08:00
Sabba Petri 7f200b7d18 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into sidebar_state_toggle 2015-02-24 09:41:10 -08:00
Dmitriy Zaporozhets 428df28cda Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-24 09:13:29 -08:00
Douwe Maan 5179c5830b Contributed projects either have user pushes or created MRs. 2015-02-24 18:13:11 +01:00
Dmitriy Zaporozhets 59877d313e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-02-24 09:09:31 -08:00