home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Marin Jankovski 6146e2940d Merge branch 'event_tooltip_addition' into 'master' 
Added information to tooltips

Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992

See merge request !1571
 2015-02-26 18:50:23 +00:00
Dmitriy Zaporozhets f05168b1a1 Merge branch 'import-status-page-link' into 'master' 
Fix import status page project links for new Rails.

Fixes #2059.

See merge request !1593
 2015-02-26 17:40:06 +00:00
Dmitriy Zaporozhets 386178aedf Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-26 09:36:43 -08:00
Dmitriy Zaporozhets b510223e7f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helper 2015-02-26 09:34:35 -08:00
Dmitriy Zaporozhets 6de4e4a622 Include route helper shortcut in controller 2015-02-26 09:34:20 -08:00
Dmitriy Zaporozhets 01660f0d6d Merge branch 'z_index_for_sticky_header' into 'master' 
Add z index for diff header so sticky header stays on top on diff comments.

See merge request !1603
 2015-02-26 17:33:03 +00:00
Dmitriy Zaporozhets faae454424 Merge pull request #8869 from tsigo/rs-issue-867 
Allow mass-unassigning of issues
 2015-02-26 09:04:23 -08:00
Marin Jankovski 449cf43a55 Add z index for diff header so sticky header stays on top on diff comments. 2015-02-26 09:03:34 -08:00
Dmitriy Zaporozhets f980827ba6 Merge branch 'fix_gitlab_importer' into 'master' 
Fix GitLab && Gitorious importers. Hide already imported projects

Fixes #2060

See merge request !1594
 2015-02-26 16:57:26 +00:00
Douwe Maan d3c44b1a6c Fix import status page project links for new Rails. 2015-02-26 09:50:43 +01:00
Dmitriy Zaporozhets 7fef8456e8 Merge branch 'small-fixes' into 'master' 
Small fixes

Fixes #2062 and #2061

See merge request !1601
 2015-02-26 06:31:50 +00:00
Dmitriy Zaporozhets e27f5aef46 Fix sticky diff header 2015-02-25 22:17:46 -08:00
Robert Speicher e53dd7526f Allow mass-unassigning of issues 
Fixes #867

[ci skip]
 2015-02-25 23:57:23 -05:00
Dmitriy Zaporozhets c254cb03d8 Fix affix for issue and merge request with image in description 2015-02-25 20:00:28 -08:00
Dmitriy Zaporozhets e993b59b7d Dont render project entity 2015-02-25 19:53:45 -08:00
Dmitriy Zaporozhets 128012dba8 More use of shortcut routes 2015-02-25 19:50:01 -08:00
Dmitriy Zaporozhets 0a4dec24c8 Add explanation to routing method 2015-02-25 19:41:17 -08:00
Dmitriy Zaporozhets 1da71cc520 Introduce shortcuts for routing helpers 2015-02-25 19:34:16 -08:00
Dmitriy Zaporozhets 5cd304dd5e Merge branch 'fix-invalid-syntax' into 'master' 
Fix git syntax issue for git version older then 1.7.10

For #2067

See merge request !1599
 2015-02-26 02:49:12 +00:00
Dmitriy Zaporozhets 0d884ff2b1 Merge branch 'extend_markdown_upload' into 'master' 
Generalizes image upload in drag and drop in markdown to all files

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.

- [x] Rebase on master when !1553 is merged in

See merge request !1530
 2015-02-25 23:36:03 +00:00
Dmitriy Zaporozhets 1511506f72 Fix git syntax issue 2015-02-25 15:17:20 -08:00
Sabba Petri e4dc4390e5 Reverting pixel change 
Breaks navbar
 2015-02-25 14:15:40 -08:00
Sabba Petri df31e0a88c Fixed up app_logo 
Pixel perfection.
 2015-02-25 13:41:35 -08:00
Sabba Petri 2c0cc2e1f6 Added hover state 
And also fixed it being one pixel off.
 2015-02-25 13:34:04 -08:00
Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import' 
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
 2015-02-25 09:21:45 -08:00
Douwe Maan 4658e554b7 Fix EmailsOnPush comparison link to include first commit. 2015-02-25 18:14:29 +01:00
Douwe Maan a672b46883 Include number of affected people in all/group mention autocomplete item. 2015-02-25 17:34:01 +01:00
Douwe Maan f0b78a8529 Clarify EmailsOnPushService options. 2015-02-25 16:40:48 +01: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
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 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