Commit Graph
2832 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 993fc84855 Use sign icon style for help link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 22:00:23 +03:00
Dmitriy Zaporozhets c608a5dcea Add sort dropdown for admin projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 17:02:57 +03:00
Dmitriy Zaporozhets 7660290b37 Merge pull request #6892 from cirosantilli/remove-signin-link-front-page
Remove redundant signin link from signin page.
2014-05-01 22:58:48 +03:00
Alexander Mills cc9b7cba38 Updated CI error message so that it makes more sense 2014-05-01 15:42:28 +01:00
Ciro Santilli 469077e55d Add help link to header. 2014-05-01 09:14:52 +02:00
Dmitriy Zaporozhets 9eeb96846f Merge pull request #6877 from Nighoo/repository_push_email.text
do not html encode plaintext part of emails for push notifications
2014-04-29 18:07:55 +03:00
Dmitriy Zaporozhets dba913aa38 Merge pull request #6876 from dblessing/fix_broadcast_text
Fix unclear text in broadcast message view.
2014-04-29 18:07:26 +03:00
Ciro Santilli 513dbdbff3 Remove redundant signin link from signin page. 2014-04-29 11:49:42 +02: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
Nico Suhl 25cc5fbf78 do not html encode plaintext part of emails for push notifications
Also-by: Andrew Karpow <andy@ndyk.de>
2014-04-26 03:43:24 +02:00
Drew Blessing 4618ec8791 Fix unclear text in broadcast message view. 2014-04-25 15:31:30 -05: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 da4c13f11d Merge branch 'active-users' into 'master'
Active users

Show the number of active users in the dashboard.
2014-04-15 10:36:41 +00:00
Dmitriy Zaporozhets ca0691ca8e Merge branch 'prevent-two-links-in-emails' into 'master'
Prevent-two-links-in-emails

Only one link per email to prevent clicking the wrong one.
2014-04-15 10:36:25 +00:00
GitLab b011486731 Add monthly active users to the admin dashboard. 2014-04-15 10:23:37 +02: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
dosire c5bbb15d0c 100k organizations use GitLab. 2014-04-14 13:50:31 +02:00
Olle Kelderman ca6978dfc5 Replace $your_email with actual email-address. Fixes #6714 2014-04-14 05:00:48 +02: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
Dmitriy Zaporozhets 71678f08f8 Merge branch 'issue_on_empty_repo' into 'master'
Fix for error 500 on create issue for empty repo
2014-04-09 10:11:45 +00:00
Marin Jankovski e617cf95d4 Add issue to an empty repo, test. 2014-04-08 17:12:57 +02:00
dosire 16567af9f5 Use placeholder to prevent using the find box to add new members. 2014-04-08 11:11:14 +02:00
Marin Jankovski af5ea92cc4 Merge branch 'master' into login_page
Conflicts:
	CHANGELOG
2014-04-07 20:13:37 +02:00
Dmitriy Zaporozhets d70939f680 Remove unnecessary sign *
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-07 18:59:10 +03: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
Marin Jankovski aea3712e8d Add option for disable standard signin. 2014-04-07 17:11:06 +02:00
Dmitriy Zaporozhets 650d0bc695 Merge branch 'improve-oauth'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-04-07 17:15:31 +03:00
Dmitriy Zaporozhets 4ab32be8a7 Dont care about emails for oauth
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-07 15:20:40 +03:00
dosire 6e4dbde2e7 Improve actionability of notice. 2014-04-07 14:14:14 +02:00
Dmitriy Zaporozhets a73df4f72d Allow oauth signup without email
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-07 14:09:29 +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