home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,534 Commits 48 Branches 340 Tags
6dc09db53d5951fe274c3ff6d35ac77d40e2a310
Commit Graph
837 Commits
Author SHA1 Message Date
Alexander Mills cc9b7cba38 Updated CI error message so that it makes more sense 2014-05-01 15:42:28 +01:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03:00
Jacob Vosmaer 285926918b Serialize last_fetched_at as a string with seconds 2014-04-28 12:42:01 +02:00
Jacob Vosmaer 7ec5ff4dba Pass last_fetched_at for notes to javascript 2014-04-28 12:21:49 +02:00
Dmitriy Zaporozhets cad9572ee9 Merge pull request #6780 from cbordei/hotfix/issue-6615 
Fixed multiple close issue #6615
 2014-04-15 18:37:45 +03:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Cristian Bordei 8e278cfe75 Fixed multiple close issue #6615 2014-04-15 16:55:07 +03:00
Dmitriy Zaporozhets 0d3ba71bcb Merge pull request #6774 from cirosantilli/issue-form-rename-fields 
Rename issue form tags Subject -> Title and Details -> Description
 2014-04-15 09:39:29 +03:00
Dmitriy Zaporozhets 9c7a9d92ff Merge pull request #6773 from tsigo/rs-tag-page-sorting 
Use VersionSorter on the Project > Tags page
 2014-04-15 09:30:39 +03:00
Ciro Santilli d2b4948a1f Rename issue form tags to match MR and params. 2014-04-14 23:36:12 +02:00
Dmitriy Zaporozhets 6be82c5e3b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-14 22:11:47 +03:00
Drew Blessing f34972358c Show actual commit count on project dashboard 2014-04-14 12:01:18 -05:00
Robert Speicher c803e78fd0 Use VersionSorter on the Project > Tags page 2014-04-14 12:40:27 -04:00
Dmitriy Zaporozhets 2ed56ce9d4 Merge branch 'speed_up_wiki_pages' into 'master' 
Speed up wiki pages page
 2014-04-14 13:20:35 +00:00
Dmitriy Zaporozhets 352bb97266 Merge pull request #6731 from hiroponz/better-title-format-for-wiki-page 
Better title format for wiki page
 2014-04-13 20:13:02 +03:00
Marin Jankovski 872482678b Speed up loading and add pagination to wiki pages page. 2014-04-11 10:02:52 +02:00
Dmitriy Zaporozhets 415c0f4bbe Fix download link for huge MR diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-10 13:45:02 +03:00
Hiroyuki Sato bca528a57c Better title format for wiki page 
The title format for wiki page may be unintelligible.
For example 'GitLab' is converted to 'Git Lab', 'MySQL' is converted to
'My Sql', etc.
 2014-04-10 15:14:02 +09:00
Dmitriy Zaporozhets fae6eb6353 Merge branch 'wiki-refactoring' into 'master' 
Wiki refactoring

Better names for variables and classes
 2014-04-09 17:48:46 +00:00
Dmitriy Zaporozhets b27c42be87 Rename wiki variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:01 +03:00
Marin Jankovski e617cf95d4 Add issue to an empty repo, test. 2014-04-08 17:12:57 +02:00
Dmitriy Zaporozhets 3befe6ec33 Fix show/hide discussion link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 18:57:57 +03:00
Dmitriy Zaporozhets bfd4494890 Merge branch 'show_diff' into 'master' 
Show note diff if diff exists
 2014-04-06 17:01:15 +00:00
Dmitriy Zaporozhets 8e7f80eed1 Restyle merge request accept and ci widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 17:10:37 +03:00
Dmitriy Zaporozhets 7ced2eb447 Use normal btn size for test service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 14:26:24 +03:00
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
 2014-04-06 13:54:54 +03:00
Marin Jankovski 17bb700712 Only show diff it exists. 2014-04-04 19:12:23 +02:00
Dmitriy Zaporozhets 8cc5e85543 Mention protected branch force push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 17:06:11 +03:00
Dmitriy Zaporozhets 9ee697dd68 Use MergeRequest services in API and controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:51:53 +03:00
Dmitriy Zaporozhets 2ab53dfb1c Merge branch 'issue_search_filter' into 'master' 
Fix reset of issue search on submit
 2014-04-02 15:30:13 +00:00
Dmitriy Zaporozhets 09d24a1f67 Better title suggestion for new MR 
Ex. if branch named "refactor-models" then title will be "Refactor models"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 14:16:37 +03:00
Marin Jankovski b06f43288a Pass the required parameters on search submit. 2014-04-02 12:26:09 +02:00
Dmitriy Zaporozhets 0e44039e52 Merge pull request #6395 from dpursehouse/grammar-fixes 
Fix another instance of "created at"
 2014-03-27 19:53:22 +02:00
Dmitriy Zaporozhets c66218ec94 Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permission 
Always show merge status
 2014-03-27 19:48:05 +02:00
Jeroen van Baarsen 592dce18b5 Always show merge status 
Always show the merge status of a merge request, even if the user has no
permission to do the actual merging.

Fixes
http://feedback.gitlab.com/forums/176466-general/suggestions/5673321-everyone-should-be-able-to-see-a-mr-status
 2014-03-27 15:32:28 +01:00
Kyle Fazzari 762c7b4f2b Fixed 500 error when creating issue for project with no commits. 
The form was updated to check that the repository wasn't empty before trying
to load the contribution guide.

This fixes #153.
 2014-03-27 08:20:43 -04:00
Marin Jankovski 0f05519777 Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2 
Refactor Parallel Diff feature and add scrollbars
 2014-03-27 08:20:25 +01:00
George Dewar 83f811fff5 Refactor Parallel Diff feature and add scrollbars 
Also now removed lines relating to unused comments feature
 2014-03-27 09:15:25 +13:00
Marin Jankovski 043c9f8640 Change Diff to Changes in views. 2014-03-26 14:00:12 +01:00
Dmitriy Zaporozhets e320ee3fb7 Merge branch 'humanize-over-titleize' into 'master' 
Use humanize instead of titleize for MR title suggestion
 2014-03-25 10:06:11 +00:00
Dmitriy Zaporozhets 0aed79b5b5 Merge branch 'improve-archived-projects' into 'master' 
Proper message for archived projects at MR#show page

Fixes #940
 2014-03-25 09:41:35 +00:00
Dmitriy Zaporozhets 394737b2cb Use humanize instead of titleize for MR title suggestion 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-24 16:15:57 +02:00
Dmitriy Zaporozhets eb4320cb07 Remove assignee/milestone selects from MR form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-24 15:20:29 +02:00
Dmitriy Zaporozhets 5fbf15cb88 Add proper explanation to MR in archived projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-24 15:10:21 +02:00
awiddersheim 3704d85bc4 Remove periods from merge request 
The "Merged by" and "Closed by" statements end with an extra space followed by a period. This doesn't seem necessary to me and not having the extra space followed by a period looks better to me. Also, the top of the merge request doesn't have the sentence ending with a period.
 2014-03-22 16:44:13 -04:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Dmitriy Zaporozhets f84d015fa9 Fix commit comment count css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 23:09:43 +02:00
Dmitriy Zaporozhets 0d7986a8c7 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
 2014-03-14 12:00:21 +02:00
Dmitriy Zaporozhets 2a7da96a0d Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
 2014-03-13 23:11:16 +02:00
Dmitriy Zaporozhets 44c9403917 Hide retry import form for non masters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 10:27:20 +02:00