home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,244 Commits 48 Branches 340 Tags
08be25eb4b9e618dcc65a0ffaea5bf0c63dc8a65
Commit Graph
3502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 08be25eb4b Merge pull request #4826 from amouhzi/patch-1 
Fix bug in ace-src-noconflict with Relative url.
 2013-08-21 04:12:46 -07:00
Dmitriy Zaporozhets e67574fe77 Merge pull request #4829 from hiroponz/render-not-found-when-failing-to-look-for-commit 
Render not found when failing to look for commit
 2013-08-21 04:11:52 -07:00
Hiroyuki Sato 1101ceb3f4 A little improvement 
1. Replace params key 'q' with 'extended_sha1'. A extended SHA1 syntax is explained in 'man gitrevisions'.
2. Change the placeholder of looking for commit.
3. Change the label of ref filter.
 2013-08-21 19:20:29 +09:00
Dmitriy Zaporozhets fede36f089 Add z-index to flash message 2013-08-21 12:40:02 +03:00
Dmitriy Zaporozhets 8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00
Dmitriy Zaporozhets fb492386c5 Fix accidentally removed class name 2013-08-21 12:33:12 +03:00
Dmitriy Zaporozhets fd1661468f Remove can_create_team code from user 2013-08-21 12:31:47 +03:00
Dmitriy Zaporozhets 606701ada4 Look for milestone by iid in milestone controller 2013-08-21 12:22:18 +03:00
Dmitriy Zaporozhets 625fb2f29d Add iids to milestones. Moved iids logic to separate concern 2013-08-21 12:16:26 +03:00
Dmitriy Zaporozhets 5d8ca6e60b Remove deprecated models 2013-08-21 12:08:32 +03:00
Hiroyuki Sato 5f24bdb7d0 Render not found when failing to look for a commit 2013-08-21 17:53:51 +09:00
Hassan Amouhzi a38c6550db Fix bug in ace-src-noconflict with Relative url. 
If we doesn't use a relative url we have this:
<pre>gon.relative_url_root=""</pre>
Else <pre>gon.relative_url_root="/gitlab"</pre>

Gitlab::Application.config.assets.prefix contains:
<pre>/assets</pre>
 2013-08-21 09:13:50 +02:00
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
Dmitriy Zaporozhets 817b9d1b47 Merge branch 'refactor/access_roles' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:10:40 +00:00
Dmitriy Zaporozhets d04ad4cb5d Merge pull request #4812 from hiroponz/remove-dependancy-of-grit 
Remove the dependancy of grit from class Network::Graph
 2013-08-20 12:09:35 -07:00
Dmitriy Zaporozhets e7f92c8a16 Bold names for public projects 2013-08-20 21:50:33 +03:00
Dmitriy Zaporozhets 25e629e460 Render small avatars for inline events 2013-08-20 21:31:37 +03:00
Dmitriy Zaporozhets 9174020f14 Fix event image preview 2013-08-20 21:20:11 +03:00
Dmitriy Zaporozhets b3b9b75616 Dashboard event right margin + increased padding 2013-08-20 21:09:54 +03:00
Dmitriy Zaporozhets 23f53c43ce Rename wiki repo if project repo was removed 2013-08-20 17:44:15 +03:00
Dmitriy Zaporozhets 9acaec7a26 Searching for issue/mr by iid in markdown 2013-08-20 17:31:26 +03:00
Dmitriy Zaporozhets a73e068c06 Fixing tests after adding iid for issues/mr 2013-08-20 16:56:05 +03:00
Dmitriy Zaporozhets 7a26a4b69d Refactor access roles methods 2013-08-20 15:59:45 +03:00
Hiroyuki Sato fd0afcc996 Remove the dependancy of grit from class Network::Graph 2013-08-20 12:05:23 +09:00
Dmitriy Zaporozhets 434c034159 Iid improvemets 
* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard
 2013-08-19 22:53:11 +03:00
Dmitriy Zaporozhets 20397091f1 Show iid in event feed and uatocomplete as default id for issues, mr 2013-08-19 22:12:59 +03:00
Dmitriy Zaporozhets 608f328653 Show iid as default id for issues, mr 2013-08-19 22:12:40 +03:00
Dmitriy Zaporozhets c1583c6d74 Find issues and Mr by iid in controller 2013-08-19 22:12:04 +03:00
Dmitriy Zaporozhets 7047a44a26 Sett iid on create. Use iid as value to_param 2013-08-19 22:10:56 +03:00
Dmitriy Zaporozhets 4250c34915 Make repo graph work for large repos on slower machines 2013-08-19 20:11:41 +03:00
Dmitriy Zaporozhets a410bc1289 Merge pull request #4670 from anezi/relative-url-patch 
More fixes for supporting Relative URL
 2013-08-19 05:42:20 -07:00
Mike Bajur 798f7db24f Update flash message timeout to 5 seconds 2013-08-17 16:36:44 +02:00
GitLab 533ef87b13 Make flash messages fixed and sticked to bottom 2013-08-17 06:32:59 -04:00
Dmitriy Zaporozhets 0e387919c3 Fixed wrong last-edit time for wiki 2013-08-16 16:59:26 +03:00
Dmitriy Zaporozhets ffa234bc80 Dont render event body if empty 2013-08-16 15:40:55 +03:00
Dmitriy Zaporozhets 14db704231 Minor UI improvements to event feed 2013-08-16 15:37:42 +03:00
Dmitriy Zaporozhets 37e1f53734 Reduce padding for events on dashboard 2013-08-16 15:28:32 +03:00
Dmitriy Zaporozhets 81c0e163b8 Merge pull request #4791 from h2s/wording 
Improvements to English text
 2013-08-16 02:39:38 -07:00
amouhziandHassan Amouhzi 39d8a64d25 Fixes grack authentification under relative_url_root 
Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430
Ref: https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228

Add Rails' variable in application.rb to support relative url

This variable is used by assets compilation and other modules.

Note that user needs to change application.rb too

Restrict session cookie to the relative path if set.

Ref: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e

Fix Update attachment_uploader.rb bug with relative URL

See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace

Fix Wall relative bug with attachement files (javascript)
 2013-08-15 21:25:09 +02:00
Henry Smith 9b4e389ba9 Another wording change in accordance with a suggestion from @karlhungus 
Thanks!
 2013-08-15 20:06:43 +01:00
Henry Smith a50b787d58 Changing text as per the suggestion by @karlhungus 
Definitely sounds better like this.
 2013-08-15 20:04:09 +01:00
Henry Smith 3f28d9f733 Improved wording for the settings in the "My Profile" section 2013-08-15 19:31:00 +01:00
Henry Smith 602e2e68d9 Lots of wording improvements for the project settings area 
Summary:

 - Mostly very small things involving use of "a", "the" etc.
 - "post-receive" hooks are usually written with the hyphen in the name .
 - I changed the Web Hooks page to have a title consistent with all the other
   pages in the settings area.
 - More consistent usage of full-stops in lists.
 2013-08-15 19:19:29 +01:00
Henry Smith 0b4324938a A couple of small wording improvements for the merge request approval page 2013-08-15 19:01:05 +01:00
Henry Smith f3ee1b42bd Improved wording for the "light" heading sentences for the main dashboard pages 
These are just a few very particular fixes for small grammatical issues,
intended to polish the reading experience.
 2013-08-15 18:58:22 +01:00
Henry Smith bae85fa876 Wording improvements in the zero_authorized_projects template 
I've reworded the first sentence to say "You don't have access to any projects",
which I think sounds more natural.

I've also used the "pluralize" ActionView helper for the user's projects_limit,
so that it still looks good when it says "You can create up to 1 project.".

Finally, I've tweaked the structure of the final sentence a little bit to make
it sound a bit better.
 2013-08-15 18:53:10 +01:00
Henry Smith 4b91ffca3e More specific empty state message wording 
I've changed all the instances of "Nothing to show here" to specifically mention
the name of the entity of which there are none to show. This makes for a
slightly smoother reading experience.
 2013-08-15 18:31:16 +01:00
Johannes Schleifenbaum aaeaf7c973 Fix the link to the project branches 2013-08-15 14:02:39 +02:00
Dmitriy Zaporozhets 5558204741 Improve UI for Project settings page 2013-08-15 14:33:38 +03:00
Dmitriy Zaporozhets f230591b3d Use bold font at Dashboard#projects and Profile#groups 2013-08-15 13:24:08 +03:00