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
Dmitriy Zaporozhets b821a1bd41 Fix markdown image uploader after rails update 2015-02-23 16:29:32 -08:00
DJ Mountney 746dd89ab0 Fix 404 when deleting a project 
The deletion from the admin section was redirecting to the wrong address.
 2015-02-23 16:19:03 -08:00
Sabba Petri cb65a3f1d9 Changed button styles 
Styles for buttons are changed to match user expectations.
 2015-02-23 15:48:00 -08:00
Dmitriy Zaporozhets c6860a5828 Fix style issue for rubocop 2015-02-23 15:18:45 -08:00
Marin Jankovski d5437c4838 Merge branch 'git_clone_holder_btn' into 'master' 
Git Clone btn more apparent

Added a faint background to the button to show that it is in an
active state for the user. White background is often hard to tell
if something is being pushed, so adding a "shadow" makes it a bit
easier to tell.

Fixes #1998

See merge request !1577
 2015-02-23 22:33:19 +00:00
Sabba Petri b3fd0ca04d 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
 2015-02-23 14:27:52 -08:00
Sabba Petri 0e1d31a734 Git Clone btn more apparent 
Added a faint background to the button to show that it is in an
active state for the user. White background is often hard to tell
if something is being pushed, so adding a "shadow" makes it a bit
easier to tell. Fixes #1998
 2015-02-23 13:52:02 -08:00
Sabba Petri e35fe20479 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.
 2015-02-23 13:38:04 -08:00
Sabba Petri 5ce2d44b13 Added Profile tooltip 
For consistency sake, the profile in the navbar has a tooltip.
 2015-02-23 11:51:18 -08:00
Sabba Petri 5d2dda9744 Added information to tooltips 
Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992
 2015-02-23 11:39:08 -08:00
Sabba Petri 846f831774 Fixes grammatical consistency and small changes 
This commit adds consistency to small things like periods, commas,
etc. Also gives additional information to buttons and headers.
Fixes #2002, #2005, #2003
 2015-02-23 10:40:06 -08:00
Dmitriy Zaporozhets bb2358379e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-23 10:05:49 -08:00
Dmitriy Zaporozhets d723bf78b8 Fix git-over-http 2015-02-23 10:05:18 -08:00
Robert Schilling 859c4175f3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-23 18:41:18 +01:00
Robert Schilling 6de3000b5b Merge pull request #8841 from patschi/patch-1 
Update 7.7-to-7.8.md
 2015-02-23 18:39:00 +01:00
Robert Schilling 348b8737e4 Merge branch 'master' into 'master' 
Bump GitLab for Docker to version 7.8.0

See merge request !347
 2015-02-23 14:31:48 +00:00
Robert Schilling c8dad4f611 Merge branch 'spelling-correction' into 'master' 
Small spelling correction

There's a small spelling error on the project settings page. 'an project' is not correct English.

See merge request !348
 2015-02-23 14:30:52 +00:00
Marco Wessel 48eeb006f0 Correct spelling of 'a project avatar' 2015-02-23 15:10:56 +01:00
shafan e23110e6f1 Bump GitLab for Docker to version 7.8.0 2015-02-23 14:08:46 +00:00
Dmitriy Zaporozhets 9459e9db24 Fix updating issue 500 error 2015-02-22 22:26:09 -08:00
Dmitriy Zaporozhets 19327e6535 Fix dashboard for projects > 30 2015-02-22 22:06:43 -08:00
Marco Wessel d4bfdd34ba use update_column and set to created_at like elsewhere 2015-02-23 04:03:12 +01:00
Marco Wessel b19b8c679a Give last_activity_at a default value so it will always be set 2015-02-23 03:36:21 +01:00
Vinnie Okada 5f232b5687 Improve error messages when file editing fails 
Give more specific errors in API responses and web UI flash messages
when a file update fails.
 2015-02-22 16:01:49 -07:00
Sytse Sijbrandij 31774a3bb7 Ensure that people don't view the changelog on the stable branch because we don't update that one. 2015-02-22 12:49:00 -08:00
Patrik Kernstock 2bf0a690bf Update 7.7-to-7.8.md 2015-02-22 21:39:13 +01:00
Sytse Sijbrandij ebe0d34128 Remove unreleased for 7.8 in changelog. 2015-02-22 10:52:30 -08:00
Dmitriy Zaporozhets a7f52b6cc2 Merge branch 'rails-4.1.9' into 'master' 
Upgrade to Rails 4.1.9

Upgrade the Rails gem to 4.1.9.  Rails behavior changed in version 4.1.2, requiring that we avoid using slashes in arguments to path helpers.  This MR changes routing to use nested resources for that reason.

TODO:

* [x] Make Spinach tests green
* [x] Make it mergeable

cc @sytse @dzaporozhets

See merge request !1494
 2015-02-22 18:50:28 +00:00
Dmitriy Zaporozhets 3afd91f28d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-22 10:48:38 -08:00
Vinnie Okada 5a8d8b6f20 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/projects.html.haml
 2015-02-22 07:55:30 -07:00
Robert Schilling 352115497f Merge pull request #8840 from Razer6/fix_7-8-update_guide 
Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838
 2015-02-22 11:53:16 +01:00
Robert Schilling 50305c363b Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838 2015-02-22 10:54:28 +01:00
Dmitriy Zaporozhets 44dbbb76fc Merge branch 'ui-improvements' into 'master' 
UI improvements

* filter tabs for dashboard projects page
* handle all sidebars on mobile with Aside javascript class
* remove semantic ui dependency
* fix broken sidebar for dsahboard

See merge request !1567
 2015-02-22 06:39:26 +00:00
Dmitriy Zaporozhets 87b04868a1 Create Aside js class for handling all sidebars in UI for mobile devices 2015-02-21 22:01:27 -08:00
Dmitriy Zaporozhets 52902f5434 Improve projects UI a bit 2015-02-21 18:28:32 -08:00
Vinnie Okada 64a7ecc926 Update CHANGELOG 
Move Rails 4.1.9 changes to version 7.9.
 2015-02-21 13:16:08 -07:00
Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml
 2015-02-21 12:55:28 -07:00
Dmitriy Zaporozhets 71e146999c Render gitlab.com import block only if host is not gitlab.com 2015-02-21 11:14:17 -08:00
Marin Jankovski 829d72d30a Merge branch 'static-middleware' into 'master' 
Change check to only swap static middleware when it's enabled.

Fixes problem with #1553.

cc @marin

See merge request !1565
 2015-02-21 17:50:03 +00:00
Douwe Maan 452ba19cdd Change check to only swap static middleware when it's enabled. 2015-02-21 15:09:17 +01:00
Douwe Maan aba1251594 Merge branch 'master' into extend_markdown_upload 2015-02-21 13:46:58 +01:00
Douwe Maan 198d75b3a8 Initialize ZenMode on commit show and milestone edit pages. 2015-02-21 11:13:31 +01:00
Dmitriy Zaporozhets a224a655d8 Merge branch 'mr-commit-comment-diff-lines' into 'master' 
Fix commit comments on first line of diff not rendering in Merge Request Discussion view.

Example can be seen near the bottom on this MR: !1533.

Before:

![Screen Shot 2015-02-20 at 10.24.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/35600b98b5/Screen_Shot_2015-02-20_at_10.24.34.png)

After: the [note](https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1533/diffs#note_36449) is actually rendered.

See merge request !1552
 2015-02-21 02:06:39 +00:00
Dmitriy Zaporozhets 5484acd998 Merge branch 'empty-project-redirect-vs-404' into 'master' 
Redirect from /tree/master on empty repo instead of showing 404.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/1114

See merge request !1559
 2015-02-21 02:01:21 +00:00
Marin Jankovski 626f5bab35 Merge branch 'mattes-go-get-workaround-nginx' 2015-02-20 15:47:54 -08:00
Marin Jankovski 51349ca3c8 Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx 
Conflicts:
	lib/support/nginx/gitlab
	lib/support/nginx/gitlab-ssl
 2015-02-20 15:47:34 -08:00
Dmitriy Zaporozhets b180476bd6 Merge branch 'mr-body-single-commit' into 'master' 
Base new MR description on commit description if there's only one.

Closes #2029, again.

See merge request !1561
 2015-02-20 23:33:23 +00:00
Marin Jankovski 8ae3112b3f Merge branch 'upload-xss-access-control' into 'master' 
Fix note attachments XSS and access control

Replaces the reverted #1528, as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434, as discussed with @dzaporozhets and as summarized in #2032.

@marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged?

See merge request !1553
 2015-02-20 22:47:54 +00:00
Douwe Maan 26d57a648c Restore nginx config a little more. 2015-02-20 23:32:39 +01:00
Douwe Maan 6945f4a299 Explain Gitlab::Middleware::Static. 2015-02-20 23:30:06 +01:00