home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,446 Commits 48 Branches 340 Tags
d9b5777db182ba3ee2341b19246feba86adb5708
Commit Graph
591 Commits
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets 09d00563af Merge branch 'improve/show_issue_state' of /home/git/repositories/gitlab/gitlabhq 2013-11-27 14:01:36 +00:00
Dmitriy Zaporozhets 4091322dba Improve UX of project visiblity level. Improve "Public Access" help page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-27 13:13:33 +02:00
Dmitriy Zaporozhets d4ffcc7cbf Show issue open state as label 2013-11-27 10:22:19 +00:00
Dmitriy Zaporozhets fa7d62494a Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects 
Conflicts:
	app/models/project.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-27 11:51:46 +02:00
Dmitriy Zaporozhets 042ec53c40 Minor UI improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-27 11:29:52 +02:00
Dmitriy Zaporozhets c2f6eb0ffe Rollback preview button href 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-27 11:18:33 +02:00
Dmitriy Zaporozhets b34378c4d7 Improve preview/edit links for comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-27 11:14:42 +02:00
Sytse Sijbrandij ca1526e7ff Conventional naming for diff modes. 2013-11-27 09:00:14 +01:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets b51c2c8118 Merge pull request #5308 from Popl7/parallel-diffs-side-by-side 
diff view on commit with parallel diff view
 2013-11-26 03:31:42 -08:00
Dmitriy Zaporozhets c57180367c Fix overflow on project home page for long names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-26 10:08:46 +02:00
Dmitriy Zaporozhets 666861f8ff More compact issues page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 22:10:18 +02:00
Dmitriy Zaporozhets 11aa7b0025 Added ability to clear milestone/assignee during bulk update 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 18:57:44 +02:00
Dmitriy Zaporozhets 4cb17deec1 Fix empty sort label on issues page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-25 17:46:16 +02:00
Jason Blanchard b76948e6c9 Added sorting to project issues page 2013-11-23 15:04:50 -05:00
Judson D Neer 574fffb722 Fix grammar in fork error message. 2013-11-21 11:53:48 -08:00
Dmitriy Zaporozhets 436e96467d Nicer icons for enabled/disabled stuff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 14:05:42 +02:00
Dmitriy Zaporozhets bd20ec1a34 Remove file from repository feature 
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:14:56 +02:00
Steven ThonusandSteven Thonus 856d4088fb diff view on commit with parallel diff view 
TODO: fix comment forms to respect left and right columns
 2013-11-17 16:35:34 +01:00
Dmitriy Zaporozhets adb58e36ba Merge pull request #5557 from dpursehouse/merge-status-message-improvement 
Improve status message on merge request page
 2013-11-15 03:55:18 -08:00
Dmitriy Zaporozhets a7d3e2b9b6 Fix recent branches order. Added counters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-15 09:18:06 +02:00
Dmitriy Zaporozhets 9fbbae9dbf Small css cleanup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-14 17:23:31 +02:00
Dmitriy Zaporozhets 64edb27aa9 Extend Gitlab#default_regex. Dont allow project path ends with .git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-13 16:13:40 +02:00
Dmitriy Zaporozhets d89c6adfe6 Improve select UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 22:32:28 +02:00
Dmitriy Zaporozhets 0a08c77519 Improve UX for project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 12:56:20 +02:00
David Pursehouse dfb8d2b7ff Improve status message on merge request page 
The status message currently looks like:

  Created on Oct 24, 2013 by John , currently assigned to Bob

There is a space between the author name and the comma, which is
incorrect.  Also, there is no period at the end of the sentence,
which makes it inconsistent with the following line:

  Merged by Bob 5 minutes ago.

Change it to:

  Created on Oct 24, 2013 by John.  Currently assigned to Bob.

Also change the milestone information from:

  and attached to milestone XYZ

to:

  Attached to milestone XYZ.
 2013-11-12 18:24:03 +09:00