home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Ciro Santilli da99560ecb Factor dashboard helper methods. 2014-10-02 14:07:21 +02:00
Ciro Santilli 81eacd1b2a Disable / hide MR edit blob button if cannot edit. 2014-10-02 12:12:51 +02:00
Ciro Santilli 3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Dmitriy Zaporozhets d3388d4790 New label link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 12:55:02 +03:00
Dmitriy Zaporozhets d2808476e3 Add new milestone link. Hide empty milestone selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 12:52:19 +03:00
Dmitriy Zaporozhets c6f3f9bb33 Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/merge_requests/_form.html.haml
 2014-10-02 12:50:29 +03:00
Kirill Zaitsev 1c9d2e39c1 Hook attributes 2014-10-02 12:58:02 +04:00
Robert Schilling e2073f286e Merge pull request #7921 from cirosantilli/improve-new-file-commit-placeholder 
Improve new file commit message textarea placeholder.
 2014-10-02 10:33:09 +02:00
Robert Schilling 4b6bbf92ab Merge pull request #7881 from cirosantilli/rm-blame-extra-white 
Remove blame lines added leading whitespace.
 2014-10-02 10:29:03 +02:00
Robert Schilling 8d1137cd6d Merge pull request #7880 from cirosantilli/replace-erb-haml 
Replace :erb filter with plain HAML.
 2014-10-02 10:28:21 +02:00
Dmitriy Zaporozhets 6c3ad0dab6 Merge pull request #7853 from Razer6/feature/html_pipeline 
Factor out Emoji parsing using html-pipeline-gitlab
 2014-10-02 11:18:40 +03:00
Robert Schilling 093c2c6a01 Apply ZEN mode to all GFM forms 2014-10-02 09:59:01 +02:00
Marin Jankovski 51bc636eb3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-02 08:46:56 +02:00
Marin Jankovski 2c2c192641 Merge branch 'fix_selecting_them_upload' of gitlab.com:gitlab-org/gitlab-ce 2014-10-02 08:41:48 +02:00
Sytse Sijbrandij ec7339e6f8 Merge pull request #7920 from cirosantilli/simplify-commit-note 
Simplify custom MR good commit message hint.
 2014-10-02 08:40:02 +02:00
Achilleas Pipinellis adf0408229 Fix identation. 2014-10-01 20:07:28 +03:00
Robert Schilling 350877d050 Merge pull request #7904 from cirosantilli/titleize-actions 
Titleize blob action buttons. [failure unrelated]
 2014-10-01 17:58:28 +02:00
Robert Schilling dae670bd69 Search for 'div-dropzone' correctly 2014-10-01 17:30:40 +02:00
Robert Schilling 63377c9ba5 Disable dropzone in ZEN mode 2014-10-01 16:40:30 +02:00
Ciro Santilli 6294033024 Use button type=submit instead of input. 2014-10-01 11:12:56 +02:00
Ciro Santilli e2e4dc5942 Use blob local instead of instance. 2014-10-01 09:04:25 +02:00
Ciro Santilli b7160cb752 Remove blame lines added leading whitespace. 2014-10-01 09:04:10 +02:00
Ciro Santilli 5f10ef7c09 Replace :erb filter with plain HAML. 2014-10-01 09:03:58 +02:00
Dmitriy Zaporozhets 88d3e97e50 Merge branch 'readme_tab' into 'master' 
Add Readme tab to project show page

Fixes #1533

See merge request !1140
 2014-10-01 06:32:40 +00:00
Ciro Santilli 0d4ae0e392 Titleize blob action buttons. 2014-09-30 23:32:03 +02:00
Dmitriy Zaporozhets 76aca721b7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-30 22:48:00 +03:00
Ciro Santilli 0c84ffad1c Improve remove file textarea placeholder. 2014-09-30 21:15:33 +02:00
Ciro Santilli 04b7dd038c Improve new file commit placeholder. 2014-09-30 21:11:21 +02:00
Ciro Santilli dc7311abd2 Simplify custom MR good commit message hint. 2014-09-30 21:05:33 +02:00
Vinnie Okada b7874c8520 Fix typo in link title 2014-09-30 13:04:13 -05:00
Ciro Santilli 0f12e051c0 Remove statement without effect. 2014-09-30 17:53:54 +02:00
Dmitriy Zaporozhets 8b362fbf39 Merge branch 'email_on_push_template_changes' into 'master' 
Email on push template changes

Fixes #1304

See merge request !1136
 2014-09-30 15:09:03 +00:00
Marin Jankovski 6fd00826d2 Fix attachment upload link bug caused by introduction of zen mode. 2014-09-30 17:07:21 +02:00
Ciro Santilli 6aa0448f76 Remove trailing whitespace from views. 2014-09-30 16:41:48 +02:00
Marin Jankovski 49157242ed Save if user prefers readme or activity tab. 2014-09-30 14:27:28 +02:00
Marin Jankovski 31e50ed3e4 Add tab for readme and load readme in tab. 2014-09-30 13:32:38 +02:00
Marin Jankovski 75eacf4d44 Update email templates for email on push service with links to commit and repository. 2014-09-30 11:28:43 +02:00
Dmitriy Zaporozhets adc84bf8b4 Merge pull request #7906 from mr-vinn/fix-graph-log 
Replace Gitlab::Git::GitStats
 2014-09-30 12:19:05 +03:00
Dmitriy Zaporozhets 3f739428a0 Merge branch 'prevent_notes_polling' into 'master' 
Prevent notes polling when there are not notes

See merge request !1132
 2014-09-30 08:57:21 +00:00
Dmitriy Zaporozhets e145f46a93 Fix contributors api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 11:56:48 +03:00
Vinnie Okada 31abf76840 Replace Gitlab::Git::GitStats 
The `GitStats` class has been removed from gitlab_git, so parse commits
directly in `Repository#graph_log`.
 2014-09-29 22:58:21 -05:00
Achilleas Pipinellis bc3137ac49 Fix milestone link in issue. Closes #174 (gitlab.com). 2014-09-29 21:35:41 +03:00
Jacob Vosmaer 693cee89f9 Prevent notes polling when there are not notes 2014-09-29 17:32:56 +02:00
Dmitriy Zaporozhets 804b25956e Merge branch 'protect_default_branch_by_default' into 'master' 
Protect default branch by default

Fixes #1543

See merge request !1130
 2014-09-29 15:16:15 +00:00
Jacob Vosmaer 51f8352dca Keep tmp/repositories during clean-up 2014-09-29 17:02:45 +02:00
Dmitriy Zaporozhets 813e272896 Merge branch 'faster-branch-contains' into 'master' 
Faster branch contains detection for commit

Much faster then iterate over all branches in rugged and look for existing commit

See merge request !1129
 2014-09-29 14:53:54 +00:00
Dmitriy Zaporozhets 3dc9a67c2a Merge pull request #7898 from cirosantilli/hide-wrap-text-mr-binary 
Only show text wrap and diff notes for text in merge requests.
 2014-09-29 17:43:00 +03:00
Dmitriy Zaporozhets 88b1e0ffcd Faster branch contains detection for commit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 16:40:13 +03:00
Marin Jankovski fbc6f95a02 Protect default branch by default. 2014-09-29 15:12:07 +02:00
Ciro Santilli da4eff4add Only show text wrap and diff notes for text in MR. 2014-09-29 14:48:05 +02:00