Commit Graph
619 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f7e7dc7ebb Make note anchors actually work
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 13:32:43 +02:00
Dmitriy Zaporozhets dac67ed65f Use new ui-box classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 11:45:42 +02:00
Dmitriy Zaporozhets 7765777583 Fix project transfer feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-23 13:24:10 +02:00
Dmitriy Zaporozhets f23ffeece7 Merge branch '6-5-dev'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
2013-12-21 23:23:59 +02:00
Dmitriy Zaporozhets a849676300 Use relative dates with tooltips fopr Issue#show and MR#show
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-20 10:03:29 +02:00
Dmitriy Zaporozhets 1231a3678a Dont allow change of MR target or source projects after it was created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-20 09:48:43 +02:00
Dmitriy Zaporozhets d1aff25ca4 Consistent place for state-label across issues, mr, milestones
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 21:00:44 +02:00
Dmitriy Zaporozhets 3cdb8f26c9 UI: use different padding in labels for Issues#show and Issues#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 20:25:01 +02:00
Dmitriy Zaporozhets 63d5fcc868 UI: allign milestone to right for issue, mr show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 20:21:22 +02:00
Dmitriy Zaporozhets 3958330edc Added milestone_options and assigne_options helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 19:54:57 +02:00
Dmitriy Zaporozhets 5c68f4f4e5 remove unecessary bold text on Issue#show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 19:39:58 +02:00
Dmitriy Zaporozhets 1616dfdc07 UI improvements to issue show page
* labels moved below the issue
* removed margin in "created by..." area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 19:36:27 +02:00
Dmitriy Zaporozhets 5405f19bac Merge branch 'feature-issue-actions' of https://github.com/jasonblanchard/gitlabhq into 6-5-dev 2013-12-19 19:15:19 +02:00
Dmitriy Zaporozhets 078b3f580e Rename Services to Project services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:27:52 +02:00
Dmitriy Zaporozhets 3b0acc9eea Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 14:22:59 +00:00
Dmitriy Zaporozhets 4efaa51bbe Make comment preview button white
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:07:49 +02:00
Dmitriy Zaporozhets 1f41e1bcdd Improve commits page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:03:59 +02:00
Dmitriy Zaporozhets 5cb8525891 move arhoved label from project title to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 15:02:31 +02:00
Dmitriy Zaporozhets 79248f4ca5 Merge pull request #5866 from jhollingsworth/fix/default-public-pull-url
Update default public pull url.
2013-12-18 04:41:06 -08:00
Jason Hollingsworth 1521f467cb Update default public pull url.
This updates the default pull URL for public projects when the user
is not logged in.
2013-12-17 12:48:59 -06:00
Jason Blanchard 65448e2ff7 Added dropdown menus to issue#show page for assignee and milestone 2013-12-17 09:39:50 -05:00
Dmitriy Zaporozhets d550933907 Add new method to mailer for deliver emails with push info
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 14:45:55 +02:00
Dmitriy Zaporozhets 2428a0b2dd Add project_services dir to autoload path
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 12:58:44 +02:00
Dmitriy Zaporozhets 5ac5730547 Sort project services by title. Add textarea support to it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 12:42:13 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
2013-12-16 14:39:14 +01:00
Dmitriy Zaporozhets d46dba5830 Merge pull request #5847 from skv-headless/fix_deprecation_warnings
fix most of warnings
2013-12-16 03:22:55 -08:00
Drew Blessing fa817dffea Add time ago tooltips to show actual date/time
Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Add helper method

change to use app helper

Modify tooltips to use new helper

Convert remaining times

Adjust one tooltip
2013-12-14 15:24:12 -06:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04: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 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 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
Jeroen van Baarsen bfacf13668 Fixed all the confirm: deprecation warnings 2013-12-10 20:33:21 +01: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 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 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 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 477e9f87e1 Merge branch 'drop_rjs_2' of /home/git/repositories/gitlab/gitlabhq 2013-11-29 14:21:26 +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 81fe86b427 README link from project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 13:52:10 +02:00