Jeroen van Baarsen
34c8ca286a
Fix for edit user as admin
...
* It fixes an issue where you where able to remove your own
admin rights. This would result in a 404 error. fixes : #2283
* It fixes an issue where you would be able to block your own
account on the edit page. This fix makes the behaviour the same
as on the admin/users overview page
2014-01-11 14:54:49 +01:00
Dmitriy Zaporozhets
12dbd0a413
Merge pull request #5735 from cocoy/fix_5313
...
Fix #5313 hipchat 0.14.0 to use http_proxy
2014-01-10 14:11:29 -08:00
Dmitriy Zaporozhets
3ce3c305eb
Merge pull request #6013 from jvanbaarsen/modal-fix
...
Fixed modal so it can be closed with ESC
2014-01-10 04:51:31 -08:00
Dmitriy Zaporozhets
3ae03f5615
Merge pull request #6012 from jvanbaarsen/social_clickable
...
Made the skype and twitter username clickable
2014-01-10 04:49:02 -08:00
Dmitriy Zaporozhets
9f73388fd2
Merge pull request #6002 from jhollingsworth/feature/clone-panel-twbs3
...
Update clone panel to use input group.
2014-01-10 04:47:25 -08:00
Dmitriy Zaporozhets
95e6a5dcd3
Fix admin forms UI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-10 14:39:45 +02:00
Dmitriy Zaporozhets
f126676553
Refactor scss
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-10 14:14:55 +02:00
Dmitriy Zaporozhets
515ed7755e
Respect default theme settings. Fixed sign-in button on publica page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-10 13:58:52 +02:00
Dmitriy Zaporozhets
a67f3c393f
Merge branch 'need-merge-commit' of /home/git/repositories/gitlab/gitlabhq
2014-01-10 08:00:31 +00:00
Dmitriy Zaporozhets
54bcbba538
Merge branch 'contributing-expectations' of /home/git/repositories/gitlab/gitlabhq
2014-01-10 07:59:08 +00:00
Dmitriy Zaporozhets
a638a8df04
Merge branch 'dates-are-absolute' of /home/git/repositories/gitlab/gitlabhq
2014-01-10 07:58:32 +00:00
Jeroen van Baarsen
ef7fce4a9f
Fixed modal so it can be closed with ESC
...
* Fixes : #5343
2014-01-09 17:04:46 +01:00
Jeroen van Baarsen
b471122f3e
Made the skype and twitter username clickable
...
* I was not able to link the linkedin username,
since linkedin does not provide predictable URLS
* The skype url will start skype, and asks if you want to
call the particular user.
* The Twitter link will just go to the twitter profile
of the given user
2014-01-09 16:33:56 +01:00
dosire
3aa57b77ae
Ordinal numbers do not have the same ordinal.
2014-01-09 15:58:52 +01:00
dosire
e270cd705b
Since the 22th is fixed we can use absolute dates.
2014-01-09 15:55:57 +01:00
Dmitriy Zaporozhets
0d3f1a2d58
Merge pull request #6011 from jvanbaarsen/deprecation_warning_fix
...
Fixed the I18n deprecation warning
2014-01-09 05:17:53 -08:00
Dmitriy Zaporozhets
50d2eae864
Merge branch 'refactor/search_context' of /home/git/repositories/gitlab/gitlabhq
2014-01-09 13:17:10 +00:00
Dmitriy Zaporozhets
a9d7efa12f
Remove invalid test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-09 15:16:10 +02:00
Dmitriy Zaporozhets
768d21654a
Better search login for global context. Improved tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-09 14:23:07 +02:00
Jeroen van Baarsen
c466f4cc44
Fixed the I18n deprecation warning
2014-01-09 13:17:02 +01:00
dosire
f46620e6f4
Instead of working with remotes Dmitriy suggested to use urls.
2014-01-09 12:05:24 +01:00
Dmitriy Zaporozhets
fc60c391ae
Improve search page UX
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-09 12:51:20 +02:00
Dmitriy Zaporozhets
b49ebf5737
Use new context for search
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-09 12:37:12 +02:00
Dmitriy Zaporozhets
4791084d7c
Search::GlobalContext and Search::ProjectContext for separation between 2 types of search
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-09 12:36:55 +02:00
dosire
0f8c36b8d7
Ask people to link bakc and be prepared for feedback.
2014-01-09 09:30:01 +01:00
Dmitriy Zaporozhets
cb589d231a
Fix public project search
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-09 10:29:55 +02:00
Dmitriy Zaporozhets
f8f76fdbfd
Merge pull request #5427 from karlhungus/feature_search_code_in_public_repos
...
Allow public repo searching
2014-01-09 00:24:46 -08:00
Dmitriy Zaporozhets
a10c08c4c7
Fix tree table overflow
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-09 10:12:17 +02:00
Dmitriy Zaporozhets
9e347d9a9d
Better UI for appearence page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-09 01:06:19 +02:00
Dmitriy Zaporozhets
bcb0b6509e
Fix white line at top of no-ssh-key-message
2014-01-08 20:57:58 +02:00
Dmitriy Zaporozhets
ddb6fb9c47
Merge pull request #6008 from jhollingsworth/fix/zip-archive-ui
...
Fix download archive menu for tree view.
2014-01-08 10:22:34 -08:00
Dmitriy Zaporozhets
e19f1a11ed
Better style of username for User#show page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-08 19:57:35 +02:00
Jason Hollingsworth
b89b00bf6c
Fix download archive menu for tree view.
...
This fixes the issue of the menu going outside of the main `container`.
2014-01-08 11:33:35 -06:00
Dmitriy Zaporozhets
65696aaa2e
Fix form styles
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-08 18:59:23 +02:00
Dmitriy Zaporozhets
eace1ce645
Fix new group form
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-08 18:39:03 +02:00
Jason Hollingsworth
04baf0b569
Update clone panel to use input group.
...
Use clone panel in `Git Access` section of wiki.
2014-01-08 10:06:03 -06:00
Dmitriy Zaporozhets
3c7a806461
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2014-01-08 17:42:57 +02:00
Dmitriy Zaporozhets
c307fd22ea
Merge branch 'xss/readme' of /home/git/repositories/gitlab/gitlabhq
2014-01-08 15:13:13 +00:00
Dmitriy Zaporozhets
449a8eb95c
New entries in changelog for 6.5
2014-01-08 15:04:08 +00:00
dosire
09eccf4745
Instructions should create a merge commit and give people a chance to test the branch we are going to merge.
2014-01-08 15:58:57 +01:00
Dmitriy Zaporozhets
d6c037de81
Dont render README with markup if format is not compatible
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-08 16:32:03 +02:00
Sytse Sijbrandij
8169941742
Merge branch 'hooks_spelling' of /mnt/ebs/repositories/mmoll/gitlab-ce
2014-01-08 13:29:39 +00:00
Sytse Sijbrandij
30c2f8fbdc
Merge branch 'fix_links_to_gitlab_cloud' of /mnt/ebs/repositories/razer6/gitlab-ce
2014-01-08 13:28:40 +00:00
Dmitriy Zaporozhets
0377069841
Use css truncation instead of rails
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-08 12:42:57 +02:00
Dmitriy Zaporozhets
18fac5879d
Merge pull request #5969 from jhollingsworth/feature/zip-archive-ui
...
Add UI for downloading various archive formats.
2014-01-08 00:55:19 -08:00
Jason Hollingsworth
97c72d7417
Add UI for downloading various archive formats.
...
Change the “Download” button to a split button with options for zip and
tar.gz.
Added download option to tree view.
2014-01-07 20:50:36 -06:00
Michael Moll
acd2702ed3
minor language fixes
2014-01-07 15:19:45 +01:00
Dmitriy Zaporozhets
1ad2a93678
Merge pull request #5760 from dermoth/master
...
Fix HTTP push to public repos
2014-01-07 02:47:56 -08:00
Dmitriy Zaporozhets
a00874a9ef
Merge pull request #5937 from RandomInsano/patch-1
...
Postgres Client Needed for Ubuntu 13.04
2014-01-07 02:31:17 -08:00
Robert Schilling
8fc2932910
Fix links to GitLab cloud
2014-01-07 11:05:44 +01:00