home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,375 Commits 48 Branches 340 Tags
2a62aa45cd85f46148e9b5ebcaeaddcff06265e2
Commit Graph
577 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets 3083e5e4cd Hide new file link if not branch HEAD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 12:23:11 +02:00
Dmitriy Zaporozhets f61850e6e3 Move part of file creation logic into separate context 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 12:06:52 +02:00
Dmitriy Zaporozhets f2eb668348 Feature test for New file feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 10:45:23 +02:00
Dmitriy Zaporozhets bd2b6f5944 New feature: Create file from UI 
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 10:28:49 +02:00
Johannes Schleifenbaum d9deb24f3a Preselect the current issue tracker with selected="selected" 
The previous behavior was, that the first element of the select was
preselected, thus upon saving the project, the previous selected could
be overwritten.
 2013-11-01 15:33:47 +01:00
Johannes Schleifenbaum cc505f550d Check if a file is editied "on" a branch or a commit. 
The previous behavior was a "disabled" link, which was still clickable
and linked to the edit file action.

If the 	user accesses a path like "/edit/master/README" show the file
edit form (just like before).

If the user accesses a path like
"/edit/8d5c1f375ce99e5df84e26b0eafbf1448c6a001e/README", redirect the
user to the file detail page with a note, that he cannot edit a file
"on" a commit.

fixes #5482
 2013-10-30 11:34:26 +01:00
Dmitriy Zaporozhets 2b555306a1 Prevent 500 error if cant detect branches for commit 2013-10-23 19:29:29 +03:00
Jacob Vosmaer c2f74de4c0 Merge pull request #5395 from dpursehouse/more-label-fixes 
More label fixes
 2013-10-23 00:58:53 -07:00
David Pursehouse 03dec79c74 Fix some more instances of "Created at" 
"Created on" should be used when the timestamp is only a date.
 2013-10-23 10:15:08 +09:00
Andrey Kumanyaev 6173d0a92f Show branches list (which branches contains commit) on commit page 2013-10-21 22:54:37 +04:00
Jacob Vosmaer 5717304098 Merge pull request #5359 from dpursehouse/update-some-labels 
Minor grammatical updates in some of the labels.
 2013-10-21 07:45:09 -07:00
Dmitriy Zaporozhets cf1416fad7 Show both Private and Public labels on project show page 2013-10-21 14:20:37 +03:00
Dmitriy Zaporozhets 0407eb2ee6 Render right clone panel partial on empty project page 2013-10-21 13:47:23 +03:00
Dmitriy Zaporozhets abda0560f1 Increase project home page margins 2013-10-21 13:41:32 +03:00