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
14,456 Commits 48 Branches 340 Tags
3ff71897384b905218960c8562b681645ee21621
Commit Graph
7045 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 27e7534470 Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fix 
[bugfix] Merge request diff view behaviour fix
 2015-03-02 14:28:21 -08:00
Dmitriy Zaporozhets ed3bd155fc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-02 13:45:46 -08:00
Marin Jankovski dae8f2faeb Merge branch 'create_issue_header' into 'master' 
New Issue Header

Fixes #2073

- I've switched it from "New Issue" to "Create Issue". Small change, but grammatically correct.

See merge request !1611
 2015-03-02 20:58:38 +00:00
Jeroen van Baarsen 93bacb03e5 Merge pull request #8890 from sue445/feature/project_api_avatar_url 
Expose avatar_url in projects API
 2015-03-01 10:54:42 +01:00
sue445 51abeaa1bc Expose avatar_url in projects API 
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
 2015-03-01 10:13:01 +09:00
Robert Schilling 82a9a4c034 Merge pull request #8882 from Shine-neko/master 
Fix typo
 2015-02-28 07:48:46 +01:00
Sabba Petri a41b9533fe Changed to "Create Issue" 2015-02-27 16:24:05 -08:00
Sabba Petri df2353716b Changed header to Create New Issue 2015-02-27 16:22:53 -08:00
Mlanawo Mbechezi 9e4d3f328f fix typo 2015-02-27 22:49:40 +01:00
Dmitriy Zaporozhets ada7d0f393 Merge branch 'update_update_project_milestone_path' into 'master' 
Update project_milestone_path update route.

See merge request !1605
 2015-02-27 17:41:04 +00:00
Douwe Maan 804a2488cf Fix and test User#contributed_projects_ids. 2015-02-27 10:49:47 +01:00
Dmitriy Zaporozhets 47c5a2ab22 Merge branch 'autocomplete-mention-count' into 'master' 
Include number of affected people in all/group mention autocomplete item.

As mentioned in #2054.

To minimize misuse of all/group mentions, the autocomplete title includes the number of members this mention will notify, so users will be more considerate what groups they mention.

Example:

at-all "**all** All Project and Group Members (12)"

at-gitlab "**gitlab** GitLab (12)"

See merge request !1596
 2015-02-27 07:08:23 +00:00
Dmitriy Zaporozhets 42387b733b Merge branch 'route-helper' into 'master' 
Introduce shortcuts for routing helpers

See merge request !1600
 2015-02-27 07:03:01 +00:00
Dmitriy Zaporozhets 6ac0a0217c Fix syntax issue 2015-02-26 16:44:52 -08:00
Marin Jankovski 62a81494ba Update project_milestone_path update route. 2015-02-26 16:03:42 -08:00
Marin Jankovski 5bf492fe1f Merge branch 'filter_icons_btn' into 'master' 
Filter icons look like proper buttons

The filter icons (Push events, Merge events, Comments, Team) now have a border
that signifies they can be pushed. This not only keeps it in line with the rest
of the application buttons, but it makes it more obvious, especially for the
Merge events button with a checkbox icon.

Fixes #1993

See merge request !1576
 2015-02-26 19:44:46 +00:00
Marin Jankovski fc7f3bf8a1 Merge branch 'small_profile_changes' into 'master' 
Fixes grammatical consistency and small changes

This commit adds consistency to small things like periods, commas,
and gives additional information to buttons and headers, etc.

Fixes #2002, #2005, #2003.

See merge request !1570
 2015-02-26 19:38:24 +00:00
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
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 a672b46883 Include number of affected people in all/group mention autocomplete item. 2015-02-25 17:34:01 +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 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