Software Publico / Gitlab

28 Mar, 2014

1 commit

4af38885 Merge branch 'documentation/update_mr_contribution_section' into 'master' ... Browse Code »

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 +0000

27 Mar, 2014

25 commits

1f988a22 Merge pull request #6553 from tehZeno/patch-1 ... Browse Code »
```
Update 6.0-to-6.5.md
```
Marin Jankovski
2014-03-27 23:19:45 +0100
cfc4a2db Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into patch-1 Browse Code »

Franz-Robert van Vugt
2014-03-27 21:40:33 +0100
fc5ac145 Merge branch 'getting-help-on-website' into 'master' ... Browse Code »
```
Getting-help-on-website
```
Dmitriy Zaporozhets
2014-03-27 18:31:21 +0000
0546a989 Merge branch 'doc-readme-for-site' into 'master' ... Browse Code »
```
Doc-readme-for-site

New readme files for doc.gitlab.com
I also but the links for the api readme at the top.
```
Dmitriy Zaporozhets
2014-03-27 18:30:50 +0000
4fc57b58 Updated contribution guidelines to specify MRs should be to master. Browse Code »

Kyle Fazzari
2014-03-27 14:09:50 -0400
0e44039e Merge pull request #6395 from dpursehouse/grammar-fixes ... Browse Code »
```
Fix another instance of "created at"
```
Dmitriy Zaporozhets
2014-03-27 19:53:22 +0200
98ed1ecc Merge pull request #6491 from esmail/patch-1 ... Browse Code »
```
Database doc changes to address #2412 and #6451.
```
Dmitriy Zaporozhets
2014-03-27 19:49:09 +0200
c66218ec Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permission ... Browse Code »
```
Always show merge status
```
Dmitriy Zaporozhets
2014-03-27 19:48:05 +0200
0c5c1157 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Marin Jankovski
2014-03-27 16:10:58 +0100
9ec08daa Move help to the website. Browse Code »

dosire
2014-03-27 16:08:02 +0100
7d0438a5 Merge branch 'fix_architecture_img' into 'master' ... Browse Code »
```
Fix Architecture Img

Image in architecture doc was not showing correctly. Now it is.
```
Marin Jankovski
2014-03-27 15:07:36 +0000
3b3186d5 fix image not displaying in GitLab due to faulty markdown Browse Code »

Job van der Voort
2014-03-27 14:34:55 +0000

592dce18 Always show merge status ... Browse Code »

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 +0100

efe792f1 Merge pull request #6632 from blackst0ne/patch-1 ... Browse Code »
```
Update permissions.md
```
Sytse Sijbrandij
2014-03-27 14:39:04 +0100

168afa02 Merge branch 'bugfix/153/500_when_create_issue' into 'master' ... Browse Code »

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 +0000

762c7b4f Fixed 500 error when creating issue for project with no commits. ... Browse Code »
```
The form was updated to check that the repository wasn't empty before trying
to load the contribution guide.

This fixes #153.
```
Kyle Fazzari
2014-03-27 08:20:43 -0400
417c0cb2 New doc site needs indexes. Browse Code »

dosire
2014-03-27 12:17:27 +0100
8a90db9e Test the new doc index. Browse Code »

dosire
2014-03-27 10:56:30 +0100
b04c3433 Put important information at the top of the readme. Browse Code »

dosire
2014-03-27 10:53:26 +0100
0f055197 Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2 ... Browse Code »
```
Refactor Parallel Diff feature and add scrollbars
```
Marin Jankovski
2014-03-27 08:20:25 +0100
cf7aab9b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-03-27 08:56:13 +0200
aabd90a8 Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-03-27 08:55:51 +0200
5d966ccd Merge branch 'ldap_check' into 'master' ... Browse Code »
```
gitlab:ldap:check uses LDAP user filter
```
Dmitriy Zaporozhets
2014-03-27 06:53:57 +0000
682cafdc Update permissions.md Browse Code »

blackst0ne
2014-03-27 15:43:16 +1000
83f811ff Refactor Parallel Diff feature and add scrollbars ... Browse Code »
```
Also now removed lines relating to unused comments feature
```
George Dewar
2014-03-27 09:15:25 +1300

26 Mar, 2014

14 commits

23e2ec6b Merge branch 'check-css' into 'master' ... Browse Code »
```
Check Css

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

As per implementation by Christopher Arnold.
```
Dmitriy Zaporozhets
2014-03-26 19:08:35 +0000
afcaf662 Merge branch 'rename_mr_diff_tab' into 'master' ... Browse Code »
```
Rename Diff to Changes
```
Dmitriy Zaporozhets
2014-03-26 17:38:24 +0000
7bf92b36 Ldap check recognize ldap user filter. Browse Code »

Marin Jankovski
2014-03-26 15:38:14 +0100
043c9f86 Change Diff to Changes in views. Browse Code »

Marin Jankovski
2014-03-26 14:00:12 +0100
466203eb Additional check in the test. Browse Code »

Marin Jankovski
2014-03-26 12:56:25 +0100
1aabfcb9 Change the user search query to be case insensitive. Browse Code »

Marin Jankovski
2014-03-26 12:45:39 +0100
961d8793 Add the tests for user search. Browse Code »

Marin Jankovski
2014-03-26 12:44:00 +0100
ad7cd8fb Merge pull request #6222 from nickryand/background_init ... Browse Code »
```
Removed the backgrounding of the unicorn_rails startup scripts
```
Jacob Vosmaer
2014-03-26 12:25:40 +0100

24e9c5e8 Merge branch 'bugfix/fix_unicorn-sidekiq_confusion_in_gitlab_init_script' into 'master' ... Browse Code »

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 +0000

416f551e Merge pull request #5879 from krzaczek/smartos-fix ... Browse Code »
```
Init script - change stop() function name to stop_gitlab()
```
Jacob Vosmaer
2014-03-26 12:08:31 +0100
78a7a9b0 Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Marin Jankovski
2014-03-26 11:21:42 +0100
1fca26c9 Merge pull request #6626 from andreausu/add-slack-username ... Browse Code »
```
Change the notification sender username to GitLab in Slack Notifier
```
Marin Jankovski
2014-03-26 11:21:17 +0100
d21ad741 Changed the notification sender username to GitLab in Slack Notifier Browse Code »

Andrea Usuelli
2014-03-26 10:58:51 +0100