| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update development steps. | Marin Jankovski | 2014-04-08 | 2 | -0/+4 |
| | | |||||
| * | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2014-04-08 | 1 | -16/+15 |
| |\ | |||||
| | * | Merge branch 'irc-status' into 'master' | Sytse Sijbrandij | 2014-04-08 | 1 | -1/+1 |
| | |\ | | | | | | | | | | Irc status | ||||
| | | * | Officially supported irc might cause people to expect too much. | dosire | 2014-04-08 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge branch 'irc_update' into 'master' | Sytse Sijbrandij | 2014-04-08 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | Update status of IRC in PROCESS doc Just a small fix to update the official status of the IRC channel in the PROCESS.md doc. | ||||
| | | * | Change IRC to official | Drew Blessing | 2014-04-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'merge-request-officer' into 'master' | Sytse Sijbrandij | 2014-04-08 | 1 | -15/+14 |
| | |\ \ | | | | | | | | | | | | | Merge Request Officer | ||||
| | | * | | Small edit. | dosire | 2014-04-07 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Simplify the contributing process and introduce MRO's. | dosire | 2014-04-07 | 1 | -15/+14 |
| | | | | | |||||
| * | | | | More info about GitLab integrations with OAuth | Dmitriy Zaporozhets | 2014-04-08 | 3 | -2/+45 |
| |/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2014-04-08 | 4 | -4/+17 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'login_page' into 'master' | Dmitriy Zaporozhets | 2014-04-08 | 4 | -4/+17 |
| | |\ \ \ | | | | | | | | | | | | | | | | Add option to disable standard login | ||||
| | | * \ \ | Merge branch 'master' into login_page | Marin Jankovski | 2014-04-07 | 9 | -27/+30 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: CHANGELOG | ||||
| | | * | | | Add option for disable standard signin. | Marin Jankovski | 2014-04-07 | 4 | -4/+17 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-04-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Merge branch 'grammer_fix' into 'master' | Dmitriy Zaporozhets | 2014-04-07 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grammer Fix Should read like: ``` Your project limit is 10 projects! Please contact your administrator to increase it ``` Instead of: ``` Your own projects limit is 10! Please contact administrator to increase it ``` | ||||
| | | * | | | Fix project limit reached grammer. | Josh Frye | 2014-04-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #6717 from pkgr/fix-database-parsing-gitlab-setup | Dmitriy Zaporozhets | 2014-04-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Allow to parse heroku-generated database.yml config file. | ||||
| | * | | | | | Allow to parse heroku-generated database.yml config file. | Cyril Rohr | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hook | Dmitriy Zaporozhets | 2014-04-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fix url generation error on hook invalid create | ||||
| | * | | | | | Fix url generation error on hook invalid create | skv | 2014-04-06 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'namespacefix-changelog' into 'master' | Dmitriy Zaporozhets | 2014-04-07 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Namespacefix changelog Forgot the changelog entry. Thanks @sytse Fixes #908 | ||||
| | * | | | | | | add namespace fix to changelog | Job van der Voort | 2014-04-07 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #6718 from pkgr/fix-procfile | Dmitriy Zaporozhets | 2014-04-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix Procfile to be usable in production. | ||||
| | * | | | | | | Fix Procfile to be usable in production. | Cyril Rohr | 2014-04-07 | 1 | -1/+1 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Allow people to remove source branch of fork project in MR | Dmitriy Zaporozhets | 2014-04-07 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | Remove unnecessary sign * | Dmitriy Zaporozhets | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | Fix show/hide discussion link | Dmitriy Zaporozhets | 2014-04-07 | 1 | -16/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | Merge branch 'breack-attack' into 'master' | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breack attack Fixes #1104 | ||||
| | * | | | | | | Comment gzip: off be default | Dmitriy Zaporozhets | 2014-04-07 | 1 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Disable compression to prevent BREACH attack | Dmitriy Zaporozhets | 2014-04-03 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Merge branch 'fix-faulty-namespaces' into 'master' | Dmitriy Zaporozhets | 2014-04-07 | 2 | -1/+11 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix faulty namespaces Fixes #908 Now with updated schema. | ||||
| | * | | | | | | add a space | Job van der Voort | 2014-04-07 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Fix faulty namespaces | Job van der Voort | 2014-04-07 | 2 | -1/+11 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Fix link in integration doc | Dmitriy Zaporozhets | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'improve-oauth' | Dmitriy Zaporozhets | 2014-04-07 | 9 | -5/+35 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | ||||
| | * | | | | | | Avoid false validation when create user | Dmitriy Zaporozhets | 2014-04-07 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | | Make oauth works for google oauth too | Dmitriy Zaporozhets | 2014-04-07 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | | Add nickname to oauth_spec | Dmitriy Zaporozhets | 2014-04-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | | Dont care about emails for oauth | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | | Skip require email for devise controllers | Dmitriy Zaporozhets | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | | Allow oauth signup without email | Dmitriy Zaporozhets | 2014-04-07 | 6 | -4/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Merge branch 'link-to-github-app' into 'master' | Dmitriy Zaporozhets | 2014-04-07 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | Link to github app | ||||
| | * | | | | | | Name should be oauth and not twitter. | dosire | 2014-04-07 | 2 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'wording-of-link-text' into 'master' | Dmitriy Zaporozhets | 2014-04-07 | 2 | -1/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Wording of link text | ||||
| | * | | | | | | Image for GitHub app setup. | dosire | 2014-04-07 | 1 | -0/+0 |
| | | | | | | | | |||||
| | * | | | | | | Improve actionability of notice. | dosire | 2014-04-07 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | fix image link | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+2 |
| | |_|/ / / / |/| | | | | | |||||
| * | | | | | | Merge branch 'add-github-app' into 'master' | Dmitriy Zaporozhets | 2014-04-07 | 1 | -1/+4 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | Add github app | ||||
| | * | | | | | Also add example for GitHub. | dosire | 2014-04-07 | 1 | -1/+4 |
| |/ / / / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |