Commit Graph
2392 Commits
Author SHA1 Message Date
Drew Blessing d9b5777db1 Allow user to hide the message to add an ssh key permanently
Favor links instead of buttons

Remove unnecessary class

Remove extra space
2013-12-14 20:21:12 -06:00
Dmitriy Zaporozhets b1eb3d4670 Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhq 2013-12-13 13:28:55 +00:00
Dmitriy Zaporozhets 2ca4e70894 Show MR accept info only if merge request is open
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-13 13:21:12 +02:00
Dmitriy Zaporozhets 4ec8eecb66 Fix header case
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-13 13:14:43 +02:00
Dmitriy Zaporozhets a7a344f042 Fix broken UI for admin system hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-13 13:12:54 +02:00
Dmitriy Zaporozhets 9b7b27ce72 Add authenticity_token: true to multipart forms
Rails 4 does not generate token by default
It fixes bug when you get to sign-in page after trying to upload image
with comment

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 19:05:21 +02:00
Dmitriy Zaporozhets 32e18169e8 Add support for relative url to GitLab.GfmAutoComplete.Emoji.assetBase
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 18:30:32 +02:00
Dmitriy Zaporozhets 29bfe34521 Fix emojii autocomplete
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 15:31:37 +02:00
Dmitriy Zaporozhets cb599a09be Allow close of broken MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 12:20:54 +02:00
Dmitriy Zaporozhets 432018f84b Use MR#source_project_path method instead of merge_request.source_project.path_with_namespace
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 11:52:10 +02:00
Dmitriy Zaporozhets 7901d14315 Proper erro message for MR when fork removed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 11:51:39 +02:00
Dmitriy Zaporozhets 5a4386a466 Render valid message when MR source or target branch was removed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 11:33:57 +02:00
Dmitriy Zaporozhets 0cd2ea88b3 Dashboard avatars: No need to load 40px images if we render them in 24px
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-11 16:09:23 +02:00
Jeroen van Baarsen bfacf13668 Fixed all the confirm: deprecation warnings 2013-12-10 20:33:21 +01:00
Dmitriy Zaporozhets 6708a770de Even more data: confirm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:48:00 +02:00
Dmitriy Zaporozhets 74d6e492d3 More data: confirm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:46:50 +02:00
Dmitriy Zaporozhets d75eb24378 Fix more confirm deprecations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:20:54 +02:00
Dmitriy Zaporozhets ed82ab4117 Remove some deprecations and fir project helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets 7c91055e4a Fix wiki editing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets 0f5f021527 Fix commits atom feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:29 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 2293cb1051 Fixed some deprecations
* Model.all is deprecacted, use without .all
* confirm: message is deprecated, needed to be wrapped
  in data block
2013-12-10 12:11:28 +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 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
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 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
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 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
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 e3464a54d8 Remove .js format for MergeRequest controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:27:36 +02: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
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
Dmitriy Zaporozhets 4492081142 Show bare repository size in admin area(projects page)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 14:16:17 +02:00
Dmitriy Zaporozhets 81fe86b427 README link from project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 13:52:10 +02:00
Dmitriy Zaporozhets 071de30f80 Fix app theme being ignored for public projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 13:31:57 +02:00
Steven Thonus 5907207e4d showing as default http link for public repo when anonymous 2013-11-29 09:32:34 +01:00
Dmitriy Zaporozhets 2e07865f16 Merge remote-tracking branch 'origin/side-by-side'
Conflicts:
	CHANGELOG

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-28 19:26:21 +02:00
Dmitriy Zaporozhets 33aea41708 Drop rjs from Infinite scrolling
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-28 11:38:20 +02:00