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
0a0b0e1eab
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-08-21 12:09:13 +03:00
Dmitriy Zaporozhets
5d8ca6e60b
Remove deprecated models
2013-08-21 12:08:32 +03:00
Dmitriy Zaporozhets
3b0d7a3071
Drop deprecated tables
2013-08-21 12:08:10 +03:00
Dmitriy Zaporozhets
ed3d31d5b2
Warn about update to 6.1
2013-08-21 12:04:33 +03:00
Hiroyuki Sato
5f24bdb7d0
Render not found when failing to look for a commit
2013-08-21 17:53:51 +09:00
Dmitriy Zaporozhets
3680df0100
Merge pull request #4824 from lurdan/patch-1
...
fix checkout tag name
2013-08-21 01:37:35 -07: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
lurdan
f70c5fcab2
fix checkout tag name
2013-08-21 11:25:46 +09:00
Dmitriy Zaporozhets
0a44ecf3a0
Fix migrate_iids for issues
2013-08-20 22:41:05 +03:00
Dmitriy Zaporozhets
1f7d485d33
Prepare doc for update from 6.0 to 6.1
2013-08-20 22:34:14 +03:00
Dmitriy Zaporozhets
97b58d1484
6.1.0pre
2013-08-20 22:30:45 +03: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
4873034aa3
Merge pull request #4819 from croemmich/patch-1
...
Update to gitlab-shell 1.7.0 during 5.4-6.0 update
2013-08-20 12:28:19 -07:00
Dmitriy Zaporozhets
6ad88561d2
Fix wrong branch in install docs
2013-08-20 22:14:54 +03:00
Chris Roemmich
df7d426d2f
Update to gitlab-shell 1.7.0 during 5.4-6.0 update
2013-08-20 14:13:49 -05:00
Dmitriy Zaporozhets
5a664b3ca4
Fix bug in installation doc with non-install unicorn
2013-08-20 22:12:42 +03: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
27e532b426
Time for 6.0.0
v6.0.0
2013-08-20 22:05:58 +03:00
Dmitriy Zaporozhets
e7f92c8a16
Bold names for public projects
2013-08-20 21:50:33 +03:00
Dmitriy Zaporozhets
e9f1c39e7e
Fix tests
2013-08-20 21:41:14 +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
Dmitriy Zaporozhets
a442ad2b14
Added Gitlab::Access module
2013-08-20 15:59:26 +03:00
Dmitriy Zaporozhets
7daf394732
Its time for 6.0.0rc1
2013-08-20 12:41:56 +03:00
Dmitriy Zaporozhets
b66f4898ea
Better message for migrating global projects
2013-08-20 12:40:51 +03:00
Hiroyuki Sato
fd0afcc996
Remove the dependancy of grit from class Network::Graph
2013-08-20 12:05:23 +09:00
Dmitriy Zaporozhets
65cba5c6b9
Merge branch 'init-script-should-restart-unicorn' of /home/git/repositories/gitlab/gitlabhq
2013-08-19 20:22:14 +00:00
Sytse Sijbrandij
63009af117
Relative root needs to be changed in three places.
2013-08-19 22:20:32 +02:00
Sytse Sijbrandij
7c55c73d63
Fix confusing situation where install guide told you to install init.d script for puma.
2013-08-19 21:54:12 +02: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
Sytse Sijbrandij
6ec73fc9a6
Configure the relative path only one time.
2013-08-19 21:49:27 +02: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
2e5481b746
Create task to create iid for existing issues/mr
2013-08-19 22:11:18 +03:00