home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +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
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
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 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 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
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 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
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
Dmitriy Zaporozhets f7c948223d Fix access to attachments uploaded with 'Choose file' button for public 
access
 2015-02-24 09:08:34 -08:00
Sabba Petri ea31726781 Added a margin and a couple styles 
Added a background, rather than an outline, which should reduce
clutter on the screen.
 2015-02-24 09:06:59 -08:00
Douwe Maan 1bf9fa8c7f Exclude forks from profile contributions list. 2015-02-24 16:28:23 +01:00
Douwe Maan 46bcf40b2c Add ".org" back to Gitorious mentions. 2015-02-24 15:08:42 +01:00
Douwe Maan 16c767814a Re-enable rescuing from Bitbucket OAuth errors. 2015-02-24 15:07:25 +01:00
Douwe Maan bc80efb1fd Bring Gitorious import page in line with others. 2015-02-24 15:07:25 +01:00
Douwe Maan 20691df230 Add Bitbucket integration docs. 2015-02-24 15:07:25 +01:00
Douwe Maan a938b3eeb4 Link to original repo on import status pages. 2015-02-24 15:07:24 +01:00
Douwe Maan 6979b3afd5 Delete deploy key from Bitbucket after importing. 2015-02-24 15:07:24 +01:00
Douwe Maan 448817c4de Load public key in initializer. 2015-02-24 15:07:24 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +01:00
Valery Sizov 71a844cdae Web Editor: save to new branch 2015-02-24 11:43:20 +02:00
Marcin Kulik f6add983d3 Use proper Gitorious icons on import pages 2015-02-24 09:42:07 +00:00
Marin Jankovski 7561b1c2a4 Merge branch 'profile_tooltip_addition' into 'master' 
Added Profile tooltip

For consistency sake, the profile in the navbar has a tooltip.

Fixes #2007

See merge request !1572
 2015-02-24 08:06:22 +00:00
Dmitriy Zaporozhets 5e2098feb4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-23 23:50:18 -08:00
Dmitriy Zaporozhets 93447c4b14 Merge pull request #8760 from yglukhov/diff-sticky-headers 
Diff headers made sticky
 2015-02-23 23:50:07 -08:00
Dmitriy Zaporozhets 8461c4b4d3 Merge pull request #8180 from Bugagazavr/mr_update 
Trigger merge request hook when source updated
 2015-02-23 23:48:46 -08:00
Dmitriy Zaporozhets 8b9348e80d Merge branch 'improve-sidebar' into 'master' 
Improve sidebar menu for project settings

See merge request !1582
 2015-02-24 07:46:03 +00:00
Marin Jankovski ac918a5cdb Merge branch 'ldap-need-no-password' into 'master' 
LDAP users don't need to set a password to Git over HTTP.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8846.

See merge request !1575
 2015-02-24 06:52:29 +00:00
Dmitriy Zaporozhets 17296b932b Merge branch 'fix_url_links_for_gitlab_issue_tracker' into 'master' 
Using gitlab url to build links for gitlab issue tracker and add a spec.

Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/1107

This needs to go to master as the paths changed since rails upgrade

Fix for stable branch is in https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1574/

See merge request !1573
 2015-02-24 05:50:32 +00:00
Dmitriy Zaporozhets 14117c23af Merge branch 'fix-avatar-access' into 'master' 
Allow non authenticated access to avatars

For #2047

cc @douwe

See merge request !1583
 2015-02-24 05:29:38 +00:00
Dmitriy Zaporozhets 64ca07c3b9 Better readme title 2015-02-23 21:27:41 -08:00
Douwe MaanandMarin Jankovski c9829146f8 LDAP users don't need to set a password to Git over HTTP. 2015-02-23 20:04:18 -08:00
Dmitriy Zaporozhets 897a2de54c Allow non authenticated access to avatars 2015-02-23 19:35:42 -08:00
Dmitriy Zaporozhets 12589d3390 Improve sidebar menu for project settings 2015-02-23 18:43:39 -08:00
Marin Jankovski b0dfe434c6 Using gitlab url to build links for gitlab issue tracker and add a spec. Fix rubocop warnings in path. 2015-02-23 18:43:26 -08:00
Dmitriy Zaporozhets c87c1cb3b9 Merge branch 'api-empty-commit' into 'master' 
Improve error messages when file editing fails

Give more specific errors in API responses and web UI flash messages when a file update fails.  See #1479.

Instead of returning false from `Gitlab::Satellite::Files::EditFileAction#commit!` when a `Grit::Git::CommandFailed` error is raised, now `#commit!` raises a different error depending on whether the failure happened during checkout, commit, or push.

@dzaporozhets Please let me know if you want to change the HTTP status codes or the error messages in `Files::UpdateService`

cc @sytse

See merge request !1569
 2015-02-24 02:17:23 +00:00
Dmitriy Zaporozhets 8601c502e8 Merge branch 'fix-commit-zen-mode' into 'master' 
Fix ZenMode on commit show and milestone edit pages.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1110

See merge request !1557
 2015-02-24 02:02:44 +00: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
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