home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 9229893c8a Merge branch 'feature-oauth-refactoring' into 'master' 
Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169
 2014-10-13 11:46:45 +00:00
Jan-Willem van der Meer a7e071e982 Add refactoring for multiple LDAP server support 
These changes are ported from EE to CE. Apply changes for app directory
 2014-10-13 13:39:54 +02:00
Dmitriy ZaporozhetsandJan-Willem van der Meer a756fd1ff6 Merge pull request #8020 from mr-vinn/note-trunc-link 
Improve event note display in dashboard and project activity views
 2014-10-13 13:01:57 +02:00
Sytse Sijbrandij 4cbf57e800 Merge pull request #8023 from bbodenmiller/patch-4 
minor updates to mysql cleanup
 2014-10-13 11:34:06 +02:00
Dmitriy Zaporozhets 4731d77bb2 Merge pull request #8020 from mr-vinn/note-trunc-link 
Improve event note display in dashboard and project activity views
 2014-10-13 11:40:50 +03:00
Ben Bodenmiller b0e92ca9ae minor updates to mysql cleanup 
* take -> make
* correct incorrect details about when pool size was changed
 2014-10-13 00:52:08 -07:00
Robert Schilling fe14384e27 Merge pull request #8021 from bbodenmiller/schema.rb 
simplify schema.rb reset in upgrade guides
 2014-10-13 08:22:19 +02:00
Sytse Sijbrandij f7b19023b1 Merge pull request #7742 from bbodenmiller/patch-7 
Cleanup MySQL database
 2014-10-13 08:19:48 +02:00
Vinnie Okada b3c70d001d Improve dashboard note view and add tests 
Update the `#first_line_in_markdown` method so that the first line of
parsed text is displayed more reliably, and the continuation indicators
("...") are displayed in all cases where the note is truncated.

Also add Rspec tests for `EventsHelper#event_note`.
 2014-10-12 23:56:56 -05:00
Ben Bodenmiller 2b3090d91b simplify schema.rb reset in upgrade guides 2014-10-12 14:39:41 -07:00
Ben Bodenmiller d94be1ddbf Cleanup MySQL database 
Addresses changes made to installation guide and config files but never
applied in update process. Relevant changes to installation guide and
config files were made in
gitlabhq@cbb5b00,
gitlabhq@498a4e6,
gitlabhq@c33d5e1,
gitlabhq@485162e#diff-e1059d0fa0437ffad94facff86210603,
gitlabhq@72e2fe2#diff-d1b4ff7de834bae6008dd49550413a6f,
gitlabhq@5163a8f#diff-e1059d0fa0437ffad94facff86210603,
gitlabhq@993af5d#diff-e1059d0fa0437ffad94facff86210603,
&
gitlabhq@d3f5a0c.
 2014-10-12 14:29:42 -07:00
Dmitriy Zaporozhets b956605f9e Merge branch 'ambiguous-sha' into 'master' 
Fix ambiguous sha problem with mentioned commit

Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception.

- [x] write full commit sha in db.
- [x] Standardise usage of sha truncation: 8 characters everywhere.
- [x] prevent exception when ambiguous sha requested in markdown

Fixes #1644

See merge request !1171
 2014-10-12 20:28:21 +00:00
Vinnie Okada 5b2a42a091 Preserve link href in truncated note view 
Notes on the dashboard views are truncated to 150 characters; this
change ensures that when a link's text is truncated it still points to
the correct URL.
 2014-10-12 14:52:17 -05:00
Dmitriy Zaporozhets 66dd61ef0f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-12 21:51:15 +03:00
Dmitriy Zaporozhets 7a01d0cc74 Merge branch 'bug_with_apostrophe' into 'master' 
Bug with apostrophe when at mentioning users

This fixes the situation where mentioning user with apostrophe at the end causes a link to issue 39 if the project has that issue, so `@marin` would look like `@marin's`.

Fixes #1034

See merge request !1165
 2014-10-12 18:50:55 +00:00
Dmitriy Zaporozhets fba6141746 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-12 21:50:46 +03:00
Dmitriy Zaporozhets b02c21df5c Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-12 21:49:20 +03:00
Dmitriy Zaporozhets b09fd2337a Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' 
Enabling markdown pipelines from gitlab

Define which markdown pipelines are used in GitLab from application instead from gem.

See merge request !1164
 2014-10-12 18:33:27 +00:00
Sytse Sijbrandij c9c6f77ec1 Merge pull request #7915 from bbodenmiller/patch-12 
improve wording on protected branches page
 2014-10-12 14:54:36 +02:00
Ben Bodenmiller ab64ca7a11 improve wording on protected branches page 2014-10-12 05:23:12 -07:00
Vinnie Okada 8a52ff9c29 Document Markdown table formatting issue 
Add a note to the Markdown documentation about a quirk of Redcarpet's
table parsing.
 2014-10-11 12:53:27 -05:00
Dmitriy Zaporozhets b2d1e97df9 Fix spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 18:42:05 +03:00
Marin Jankovski 2ea166fc33 Make sure relative url and asset_host are honored, specs. 2014-10-10 17:31:47 +02:00
Dmitriy Zaporozhets 8c01448cf9 Dontr decoarate already decorated stuff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 17:39:29 +03:00
Dmitriy Zaporozhets 0852d5e480 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 16:36:06 +03:00
Dmitriy Zaporozhets ea04ed7879 Use 8chars short sha for commit in views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 16:30:14 +03:00
Dmitriy Zaporozhets f7342ce567 Add more stuff to changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 16:17:00 +03:00
Dmitriy Zaporozhets daa55f31d8 Dont raise exception when wrong commit id passed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:58:11 +03:00
Dmitriy Zaporozhets 200118357d Use full commit sha width for reference in note body to prevent Ambiguous SHA1 prefix problem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:44:27 +03:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:39:48 +03:00
Marin Jankovski 4149fc24cf Bump html-pipeline-gitlab gem version 2014-10-10 12:51:00 +02:00
Jan-Willem van der Meer d059f50d4c Refactor OAuth refactorings to CE 2014-10-10 12:03:32 +02:00
Dmitriy Zaporozhets 9c824888c8 Merge branch 'ssl_ciphers' into 'master' 
Ssl ciphers update

See merge request !1168
 2014-10-10 09:49:00 +00:00
Marin Jankovski be14c7a83f Add a comment on why we are using backward compatible ciphers. 2014-10-10 09:44:08 +02:00
Marin Jankovski 8ddb2be69a Revert "update ssl_ciphers" 
This reverts commit c41e5f5018.
 2014-10-10 09:38:39 +02:00
Marin Jankovski 488081cdea Merge pull request #8004 from mr-vinn/rm-task-method 
Remove unused method
 2014-10-10 08:34:18 +02:00
Marin Jankovski fc2adfb6e4 Add a comment why this is done. 2014-10-10 08:32:05 +02:00
Marin Jankovski 1d14676e0c Substitute right single quote back with apostrophe. 2014-10-10 08:24:58 +02:00
Vinnie Okada 85f1e8b84a Remove unused method 2014-10-09 22:33:29 -05:00
Dmitriy Zaporozhets d59192f81d Merge branch 'annotate' into 'master' 
Annotate

See merge request !1167
 2014-10-09 15:56:11 +00:00
Valery Sizov 82c938ad75 annotate 2014-10-09 18:22:20 +03:00
Dmitriy Zaporozhets 6303d003c6 Merge branch 't1254-snippets-refactoring' into 'master' 
Snippets need to be either public/internal/private

See merge request !1162
 2014-10-09 14:56:35 +00:00
Dmitriy Zaporozhets 2bfc2f805b Merge branch 'bump-grit' into 'master' 
Bump grit

Fixes gitlab/grit#7

See merge request !1166
 2014-10-09 14:25:51 +00:00
Marin Jankovski a912308340 Add a test for apostrophe in code blocks. 2014-10-09 16:12:17 +02:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Dmitriy Zaporozhets d567dd33db Bump gitlab-grit version with improved timeout feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-09 16:33:03 +03:00
Marin Jankovski 64e72af3cb Replace apostrophe with right single quote to avoid markdown interpretation as issue 39. 2014-10-09 14:20:49 +02:00
Marin Jankovski 099cf3558f Failing test for apostrophe at the end of user mention on project with issue iid 39. 2014-10-09 14:02:10 +02:00
Marin Jankovski b4828f4cf6 Enable markdown pipeline filters from inside gitlab. 2014-10-09 13:33:38 +02:00
Dmitriy Zaporozhets 2fb99c79ff Merge branch 'ruby-version' into 'master' 
Ruby version

I set it to the latest ruby stable version, that in my experience works without issues.

/cc @jw

See merge request !1163
 2014-10-09 11:26:38 +00:00