home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 48bd8a7e16 Merge remote-tracking branch 'origin/rake_drop_tables' 
Conflicts:
	CHANGELOG
 2014-03-28 22:37:17 +02:00
Marin Jankovski c34186f882 Refactor project watchers collecting. 2014-03-28 17:51:13 +01:00
Dmitriy Zaporozhets e6fbf79bc5 Merge branch 'ldap_nickname' into 'master' 
Remove omniauth-ldap nickname bug workaround
 2014-03-28 13:28:54 +00:00
Jacob Vosmaer 2e6b537018 Use omniauth nickname as the username for LDAP 
Before there was a bug in omniauth-ldap which prevented samaccountname
showing up as a possible username for new LDAP users. Thanks to upstream
fixes, we no longer need to work around this bug.
 2014-03-28 13:57:52 +01:00
Jacob Vosmaer 77b57c114b Drop all tables before restoring a PostgreSQL DB 
Invoking 'db:schema:load' turned out to be a bad idea: when downgrading
an existing GitLab installation, the schema of the newer version would
be preserved when trying to import the old version.
 2014-03-28 13:44:46 +01:00
Jacob Vosmaer f48fc3c6cb Add a rake task that drops all tables 2014-03-28 13:37:09 +01:00
Tom de Bruijn ce857b7cc9 Improve alignment of labels in .well-list items 2014-03-28 13:22:43 +01:00
Tom de Bruijn b7225bead8 Clearfix on well-lists. Pages affected: 
Pages affected:
- admin/groups#show
- admin/projets#index
- admin/users#index
- dashboard/issues#index (on small screens)
 2014-03-28 11:14:23 +01:00
Marin Jankovski 4af38885df Merge branch 'documentation/update_mr_contribution_section' into 'master' 
Update Contribution Guidelines: Specify Merge Request To Master

There have been occasions where contributors submitted merge requests to stable branches thinking that was the way to get changes into specific releases. This results in wasted time and effort of the GitLab team responding to the merge request requesting that it be to master, as well as the developer who needs to redo the changes.

This merge request very simply updates the contribution guidelines to specify that MRs should only be to master, and that getting changes into stable branches will be determined by the GitLab Team.

cc @JobV
 2014-03-28 09:01:00 +00:00
Yatish Mehta fcdb34373f Consistent format for class objects in javascript 2014-03-28 14:01:06 +05:30
Marin Jankovski 1f988a224c Merge pull request #6553 from tehZeno/patch-1 
Update 6.0-to-6.5.md
 2014-03-27 23:19:45 +01:00
Franz-Robert van Vugt cfc4a2dbe3 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into patch-1 2014-03-27 21:40:33 +01:00
Dmitriy Zaporozhets fc5ac1451d Merge branch 'getting-help-on-website' into 'master' 
Getting-help-on-website
 2014-03-27 18:31:21 +00:00
Dmitriy Zaporozhets 0546a98981 Merge branch 'doc-readme-for-site' into 'master' 
Doc-readme-for-site

New readme files for doc.gitlab.com
I also but the links for the api readme at the top.
 2014-03-27 18:30:50 +00:00
Kyle Fazzari 4fc57b5872 Updated contribution guidelines to specify MRs should be to master. 2014-03-27 14:09:50 -04: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 98ed1ecc3b Merge pull request #6491 from esmail/patch-1 
Database doc changes to address #2412 and #6451.
 2014-03-27 19:49:09 +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
Marin Jankovski 0c5c1157af Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-27 16:10:58 +01:00
dosire 9ec08daa90 Move help to the website. 2014-03-27 16:08:02 +01:00
Marin Jankovski 7d0438a5c0 Merge branch 'fix_architecture_img' into 'master' 
Fix Architecture Img

Image in architecture doc was not showing correctly. Now it is.
 2014-03-27 15:07:36 +00:00
Job van der Voort 3b3186d58b fix image not displaying in GitLab due to faulty markdown 2014-03-27 14:34:55 +00: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
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
dosire 417c0cb2d3 New doc site needs indexes. 2014-03-27 12:17:27 +01:00
dosire 8a90db9e33 Test the new doc index. 2014-03-27 10:56:30 +01:00
dosire b04c343311 Put important information at the top of the readme. 2014-03-27 10:53:26 +01: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
Achilleas Pipinellis 4709364b7e Refer to bundler's ability of parallel installation 2014-03-26 21:54:39 +02: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
Timm Drevensek ea82bcd396 Merge branch 'master' into request/relative_submodules 
Conflicts:
	CHANGELOG
 2014-03-26 20:07:11 +01: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