home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,986 Commits 48 Branches 340 Tags
efe792f1c3109d4195b932853bc274e3d702e371
Commit Graph
8986 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij efe792f1c3 Merge pull request #6632 from blackst0ne/patch-1 
Update permissions.md
 2014-03-27 14:39:04 +01:00
Dmitriy Zaporozhets 168afa024e Merge branch 'bugfix/153/500_when_create_issue' into 'master' 
Fix 500 Error When Creating Issue For Project With No Commits

This merge request fixes issue #153, where trying to create an issue for a project with no commits results in a 500 error. This was done by updating the form to check that the repository wasn't empty before trying to load the contribution guide.
 2014-03-27 13:12:31 +00: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
Dmitriy Zaporozhets cf7aab9b44 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-27 08:56:13 +02:00
Dmitriy Zaporozhets aabd90a828 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-27 08:55:51 +02:00
Dmitriy Zaporozhets 5d966ccd35 Merge branch 'ldap_check' into 'master' 
gitlab:ldap:check uses LDAP user filter
 2014-03-27 06:53:57 +00:00
blackst0ne 682cafdce6 Update permissions.md 2014-03-27 15:43:16 +10: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
Dmitriy Zaporozhets 23e2ec6bf2 Merge branch 'check-css' into 'master' 
Check Css

Based on Dmitriy his remark https://gitlab.slack.com/archives/general/p1395770459000142
 2014-03-26 19:08:59 +00:00
Dmitriy Zaporozhets 7ddbc92abc Merge branch 'case_insensitive_user_search' into 'master' 
Case insensitive user search

As per implementation by Christopher Arnold.
 2014-03-26 19:08:35 +00:00
Dmitriy Zaporozhets afcaf662c9 Merge branch 'rename_mr_diff_tab' into 'master' 
Rename Diff to Changes
 2014-03-26 17:38:24 +00:00
Marin Jankovski 7bf92b368f Ldap check recognize ldap user filter. 2014-03-26 15:38:14 +01:00
Marin Jankovski 043c9f8640 Change Diff to Changes in views. 2014-03-26 14:00:12 +01:00
Marin Jankovski 466203eb0c Additional check in the test. 2014-03-26 12:56:25 +01:00
Marin Jankovski 1aabfcb92d Change the user search query to be case insensitive. 2014-03-26 12:45:39 +01:00
Marin Jankovski 961d87937b Add the tests for user search. 2014-03-26 12:44:00 +01:00
Jacob Vosmaer ad7cd8fb35 Merge pull request #6222 from nickryand/background_init 
Removed the backgrounding of the unicorn_rails startup scripts
 2014-03-26 12:25:40 +01:00
Jacob Vosmaer 24e9c5e83e Merge branch 'bugfix/fix_unicorn-sidekiq_confusion_in_gitlab_init_script' into 'master' 
Fix Unicorn-Sidekiq Confusion In GitLab Init Script

This merge request fixes issue #126 by updating a few sections of the included GitLab init file where Unicorn was referred to as Sidekiq and vice-versa.
 2014-03-26 11:19:26 +00:00
Jacob Vosmaer 416f551e70 Merge pull request #5879 from krzaczek/smartos-fix 
Init script - change stop() function name to stop_gitlab()
 2014-03-26 12:08:31 +01:00
Marin Jankovski 78a7a9b0be Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-26 11:21:42 +01:00
Marin Jankovski 1fca26c94c Merge pull request #6626 from andreausu/add-slack-username 
Change the notification sender username to GitLab in Slack Notifier
 2014-03-26 11:21:17 +01:00
Andrea Usuelli d21ad74146 Changed the notification sender username to GitLab in Slack Notifier 2014-03-26 10:58:51 +01:00
Pawel Krzaczkowski 9422b451eb Init script - change start() stop() restart() reload() to xxxx_gitlab() 2014-03-26 10:50:42 +01:00
Sytse Sijbrandij 2e94f0d224 Merge branch 'gzip_changelog' into 'master' 
Gzip compression for assets in changelog
 2014-03-26 09:30:22 +00:00
Dmitriy Zaporozhets c818712dfa Reduce comments font size for events feed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 11:13:06 +02:00
Dmitriy Zaporozhets 92ca779ebc Improve comment header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 10:55:04 +02:00
Marin Jankovski acb03f1fc3 Add gzip asset compression to the changelog. 2014-03-26 09:46:51 +01:00
Dmitriy Zaporozhets 0a05c8dd8d Improve md typography 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 10:45:22 +02:00
Dmitriy Zaporozhets 99a9d97c44 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-26 10:37:33 +02:00
Dmitriy Zaporozhets fb74d4a948 Merge branch 'request/monospace_gfm_input' into 'master' 
Use monospace fonts for GFM inputs

This is an MR for [this feedback suggestion](http://feedback.gitlab.com/forums/176466-general/suggestions/5593468-use-monospace-font-in-wiki-edit-content-textarea).

I'm not sure exactly where the best place for the fix is, but I opted for the typography.scss file.  Basically, all ``textarea.js-gfm-input`` elements are styled with ``font-family: $monospace_font;``.

*PS: this being my first MR to gitlab, I apologize if I missed any steps in the process; let me know what's missing and I'll correct it here & in future MRs*
 2014-03-26 08:32:06 +00:00
Dmitriy Zaporozhets 17fd0e5c72 Merge pull request #6569 from criteo/api_merge_request_comments 
Add method to get the comments on a merge request
 2014-03-26 10:06:51 +02:00
Dmitriy Zaporozhets af0b59d477 Time for 6.8.0pre 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 09:50:18 +02:00
Dmitriy Zaporozhets eb7a986800 Merge branch 'improve_at_mentions' into 'master' 
Allow at mentions for people who are not members of the project
 2014-03-26 07:49:18 +00:00
Dmitriy Zaporozhets f0adf28ed9 Merge branch 'event-create-service' into 'master' 
EventCreateService class

The goal is to collect all event creation logic in one place called EventCreateService.
Because now its placed in observers, controllers, services etc
 2014-03-26 07:41:27 +00:00
Dmitriy Zaporozhets 05c9ab94c2 Merge branch 'refactor-author-id-of-changes' into 'master' 
Remove author_id_of_changes

To prevent confusion because we already have `current_user`
 2014-03-26 07:01:16 +00:00
dosire 5bda665d74 Nice trick for css class check mentioned by Dmitriy. 2014-03-25 21:35:08 +01:00
Dmitriy Zaporozhets 285ed33718 Merge branch 'define-feature-request' into 'master' 
Define Feature Request in Process doc
 2014-03-25 20:07:24 +00:00
dosire 74f16902cf More strict wording of the bug criteria. 2014-03-25 20:57:58 +01:00
dosire b2e7474155 Merge branch 'master' into define-feature-request 
Conflicts:
	PROCESS.md
 2014-03-25 20:57:21 +01:00
Dmitriy Zaporozhets 7f67e066dc More compact event feed and projects list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 20:10:08 +02:00
Dmitriy Zaporozhets e421772f89 Revert "Clearfix on well-lists. Pages affected:" 
Because it adds extra spaces at each project row on dashboard

This reverts commit 2767abd90d.
 2014-03-25 19:53:30 +02:00
Marin Jankovski 9dd58c320a Add to changelog. 2014-03-25 18:53:09 +01:00
Dmitriy ZaporozhetsandMarin Jankovski 5245fac63b Version 6.7.2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
 2014-03-25 18:53:09 +01:00
Marin Jankovski d26302215a Correct identation, default value if note doesn't exist. 2014-03-25 18:53:09 +01:00
Marin Jankovski 12c3962fc0 Search within project. 2014-03-25 18:53:09 +01:00
Marin Jankovski 0a4283b50a Extract sorting into a method. 2014-03-25 18:53:09 +01:00
Marin Jankovski eda2c0c607 Include commits. 2014-03-25 18:53:09 +01:00
Marin Jankovski 02850210b6 Allow referencing an existing user. 2014-03-25 18:53:09 +01:00
Marin Jankovski 01ec6c793c At mention participating users. 2014-03-25 18:53:09 +01:00