Commit Graph
3966 Commits
Author SHA1 Message Date
Jeroen van BaarsenandDmitriy Zaporozhets 2a62aa45cd Fixed some deprecation warnings 2013-12-10 12:11:27 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets e5affcf1ee Fixed default scope deprecation warning 2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets 475fedc0a7 Make User#accessible_deploy_keys works in rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets b3c1d0d8df Added allow_blank to model validations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets 16697f6efa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-10 12:09:18 +02:00
Dmitriy Zaporozhets 6a90378dae Merge branch 'key-generation' of /home/git/repositories/gitlab/gitlabhq 2013-12-10 10:02:57 +00:00
Dmitriy Zaporozhets 27900efb97 Merge pull request #5779 from jvanbaarsen/patch-1
Better warning when deleting a user
2013-12-10 01:47:35 -08:00
Dmitriy Zaporozhets a215dbe43a Use antialiased font-smoothing for webkit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-09 20:13:08 +02:00
Dmitriy Zaporozhets bc82b2f803 Merge branch 'feature/api_version_admin' of /home/git/repositories/gitlab/gitlabhq 2013-12-09 17:54:54 +00:00
Dmitriy Zaporozhets a7e1290a67 Merge branch 'bug/duplicates_in_search' of /home/git/repositories/gitlab/gitlabhq 2013-12-09 17:54:45 +00:00
Dmitriy Zaporozhets ccf2e48a2c Set noreply@HOSTNAME for reply_to field in all emails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-09 16:36:21 +02:00
Dmitriy Zaporozhets 954dd39861 Remove duplicate items from search autocomplete
Old behaviour gave you duplicate entries if your project is public

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-09 16:26:43 +02:00
Dmitriy Zaporozhets d0637d63db Show GitLab API version on Admin#dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-09 16:00:06 +02:00
Jacob Vosmaer 1af65c96c9 Avoid duplicate group membership emails 2013-12-09 09:22:59 +01:00
dosire 1661777516 The comments make it hard to copy paste commands. If you paste the whole line it fails. 2013-12-09 09:02:35 +01:00
Dmitriy Zaporozhets 1dfd585f3e Show rails version in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-06 22:20:11 +02:00
Dmitriy Zaporozhets 97e05469e2 Remove colors from icon helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-06 22:14:55 +02:00
Jeroen van Baarsen 00d72e73c8 Better warning when deleting a user
Warn the administrator better when deleting a user.
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295
2013-12-06 20:11:14 +01:00
Dmitriy Zaporozhets 3b20c89005 Add visibility filter to Dashboard#projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-05 20:26:21 +02:00
Dmitriy Zaporozhets a767c13367 Merge pull request #5752 from jhollingsworth/fix/no-404-for-project
Fix 404 on project page for unauthenticated user
2013-12-05 07:16:45 -08:00
Dmitriy Zaporozhets e5f4c7883f Fix comment form UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-05 11:55:07 +02:00
Dmitriy Zaporozhets f6d96d354c Improve avatar block UI on profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-05 11:26:55 +02:00
Jason Hollingsworth c099074fcc Fix 404 on project page for unauthenticated user
Eliminate a 404 error when user is not logged in and attempts to visit
a project page.

The 404 page will still show up when user is logged in and the project
doesn’t exist or the user doesn’t have access.
2013-12-04 13:10:20 -06:00
Dmitriy Zaporozhets cf5d3bb0ad Improve help page for Project web hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:18 +02:00
Dmitriy Zaporozhets 887c0c67ac Update WebHook help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:18 +02:00
Dmitriy Zaporozhets d4c50dbd33 Annotate web_hooks table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 5f9cdbab1d Modify test to pass new project hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets cfcf24dce5 Execute project hooks when issue or merge request created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 25951b9146 Prepare ProjectHooks to work with issues and merge_requests
* Add event scopes to ProjectHook
* Added Issuable#to_hook_data
* Project#execute_hooks now accept hook filter as argument

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 0687ecb66d UI with event types for Project WebHooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 88bab75aa4 Merge pull request #5741 from archiloque/unused_http_url
Unused http_url member in project & gollum_wiki
2013-12-04 02:51:14 -08:00
Alexander Vagin 6f0725119c Fix bug with showing create merge request button while merge request are disabled in project settings 2013-12-04 11:02:36 +03:00
Dmitriy Zaporozhets 640b913ac6 Modify logo a bit 2013-12-03 15:38:55 +02:00
Dmitriy Zaporozhets 16916fb103 Improve UI for stacked nav-pills
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-03 12:19:48 +02:00
Drew Blessing b08608b261 Issue 5716 - Allow removal of avatar
Add class and style

Add spinach tests

Add entry to CHANGELOG

Add entry to CHANGELOG
2013-12-02 16:20:34 -06:00
Dmitriy Zaporozhets e411f3bab2 Small UI fixes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 17:24:03 +02:00
Dmitriy Zaporozhets 3a2c32c054 Fix broken pagination for issues
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 15:22:38 +02:00
Dmitriy Zaporozhets bc663a7383 remove GET window.updatePage method that do dataType script
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:33:27 +02:00
Dmitriy Zaporozhets 4f32d2e28e Remove GET .js format for Milestone controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:32:54 +02:00
Dmitriy Zaporozhets e3464a54d8 Remove .js format for MergeRequest controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:27:36 +02:00
Julien Kirch 4ab31d834e Unused http_url member in project & gollum_wiki 2013-12-02 11:13:53 +01:00
Dmitriy Zaporozhets 31892227d7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-12-02 09:46:37 +02:00
Dmitriy Zaporozhets 5fd90cd5e4 Merge pull request #5724 from Popl7/add_thumbsup_thumbsdown_emoji_voting
Thumbsup and thumbsdown emoji should be counted when voting
2013-12-01 23:33:48 -08:00
Dmitriy Zaporozhets dc29b23733 Merge pull request #5725 from Popl7/http_repo_link_on_public_acces
Correct url to pull puplic repos anonymously on project page
2013-12-01 23:33:21 -08:00
Sytse Sijbrandij 71e92681f2 We welcome everyone to contribute. 2013-12-01 11:53:00 +01:00
Drew Blessing 23e36202d2 Improve Help navigation UI
Make hash keys symbols
2013-11-29 13:51:33 -06:00
Dmitriy Zaporozhets 477e9f87e1 Merge branch 'drop_rjs_2' of /home/git/repositories/gitlab/gitlabhq 2013-11-29 14:21:26 +00:00
Dmitriy Zaporozhets ff25cb934b Merge branch 'feature/repo_size_in_admin' of /home/git/repositories/gitlab/gitlabhq 2013-11-29 13:38:41 +00:00
Dmitriy Zaporozhets da10cad1da Drop rjs from Issues#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 15:05:32 +02:00
Dmitriy Zaporozhets 596e64e5d7 Drop rjs from Notes#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 14:46:40 +02:00