| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into 7-4-stable | Valery Sizov | 2014-10-27 | 3 | -6/+38 |
| |\ | | | | | | | | | | | Conflicts: CHANGELOG VERSION | ||||
| | * | Fix LDAP config lookup for provider 'ldap' | Jacob Vosmaer | 2014-10-23 | 1 | -1/+15 |
| | | | |||||
| | * | Merge pull request #8053 from mr-vinn/fix-rspec-url | Robert Schilling | 2014-10-23 | 1 | -1/+3 |
| | |\ | | | | | | | Fix Rspec error when using non-default port | ||||
| | | * | Use actual GitLab URL for test assertion | Vinnie Okada | 2014-10-18 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | Assert the full GitLab root URL, including the port, instead of using a regexp to tolerate whatever port is returned. | ||||
| | | * | Fix Rspec error when using non-default port | Vinnie Okada | 2014-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Prevent test failures when GitLab is configured to use a port other than 80. | ||||
| | * | | Merge branch 'slack_team_name' into 'master' | Valery Sizov | 2014-10-21 | 1 | -0/+20 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slack team name Fixes a problem in slack team name with hyphens. https://gitlab.com/gitlab-org/gitlab-ce/issues/701 See merge request !1204 | ||||
| | | * | | Add test for allowed team name of slack. | Marin Jankovski | 2014-10-21 | 1 | -0/+20 |
| | | | | | |||||
| | * | | | Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into ↵ | Dmitriy Zaporozhets | 2014-10-21 | 1 | -0/+26 |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | qwazerty-hipchat_api Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | ||||
| | | * | | Add Hipchat services API | Kevin Houdebert | 2014-10-14 | 1 | -0/+26 |
| | | |/ | |||||
| | * | | Merge branch 'security-api-internal-publicity' into 'master' | Dmitriy Zaporozhets | 2014-10-20 | 1 | -5/+9 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab-shell identification Part of gitlab/gitlabhq#1528 See merge request !1185 | ||||
| | | * | | add gitlab-shell identification | Valery Sizov | 2014-10-15 | 1 | -5/+9 |
| | | | | | |||||
| * | | | | internal snippets: fix exposing of title | Valery Sizov | 2014-10-24 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Fix LDAP config lookup for provider 'ldap' | Jacob Vosmaer | 2014-10-24 | 1 | -1/+15 |
| | | | | | |||||
| * | | | | Add test for allowed team name of slack. | Marin Jankovski | 2014-10-21 | 1 | -0/+20 |
| |/ / / | |||||
| * | | | Fix account existing blocking | Dmitriy Zaporozhets | 2014-10-17 | 1 | -10/+66 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Add regressiontest to verify allow_single_sign_on setting | Jan-Willem van der Meer | 2014-10-16 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | | | | | verification for #1677 Since testing omniauth_callback_controller.rb is very difficult, the logic is moved to the models | ||||
| * | | | Remove LDAP save test | Jan-Willem van der Meer | 2014-10-16 | 1 | -8/+8 |
| | |/ |/| | | | | | This is handled within the LDAP class | ||||
| * | | Add specs for authentication and config | Jan-Willem van der Meer | 2014-10-14 | 2 | -0/+73 |
| | | | |||||
| * | | Merge tests to support Multiple LDAP groups | Jan-Willem van der Meer | 2014-10-13 | 5 | -24/+31 |
| | | | |||||
| * | | Refactor lib files for multiple LDAP groups | Jan-Willem van der Meer | 2014-10-13 | 1 | -16/+10 |
| | | | |||||
| * | | Merge branch 'sorting-users-in-admin' into 'master' | Dmitriy Zaporozhets | 2014-10-13 | 1 | -0/+28 |
| |\ \ | | | | | | | | | | | | | | | | Sorting users in admin See merge request !1170 | ||||
| | * | | Admin: user sorting | Valery Sizov | 2014-10-13 | 1 | -0/+28 |
| | |/ | |||||
| * | | Merge branch 'feature-oauth-refactoring' into 'master' | Dmitriy Zaporozhets | 2014-10-13 | 3 | -69/+94 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Feature oauth refactoring same MR as gitlab/gitlab-ee!188 See merge request !1169 | ||||
| | * | | Refactor OAuth refactorings to CE | Jan-Willem van der Meer | 2014-10-10 | 3 | -69/+94 |
| | |/ | |||||
| * | | Merge pull request #8020 from mr-vinn/note-trunc-link | Dmitriy Zaporozhets | 2014-10-13 | 1 | -0/+52 |
| |\ \ | | | | | | | Improve event note display in dashboard and project activity views | ||||
| | * | | Improve dashboard note view and add tests | Vinnie Okada | 2014-10-12 | 1 | -0/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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`. | ||||
| * | | | Merge branch 'ambiguous-sha' into 'master'fondev | Dmitriy Zaporozhets | 2014-10-12 | 4 | -10/+9 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Fix tests | Dmitriy Zaporozhets | 2014-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Fix tests | Dmitriy Zaporozhets | 2014-10-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Use 8chars short sha for commit in views | Dmitriy Zaporozhets | 2014-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Use short_id instead of [0..N] for short version of commit sha | Dmitriy Zaporozhets | 2014-10-10 | 3 | -9/+8 |
| | |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'bug_with_apostrophe' into 'master' | Dmitriy Zaporozhets | 2014-10-12 | 1 | -0/+18 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Substitute right single quote back with apostrophe. | Marin Jankovski | 2014-10-10 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add a test for apostrophe in code blocks. | Marin Jankovski | 2014-10-09 | 1 | -0/+8 |
| | | | | |||||
| | * | | Replace apostrophe with right single quote to avoid markdown interpretation ↵ | Marin Jankovski | 2014-10-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | as issue 39. | ||||
| | * | | Failing test for apostrophe at the end of user mention on project with issue ↵ | Marin Jankovski | 2014-10-09 | 1 | -0/+10 |
| | | | | | | | | | | | | | iid 39. | ||||
| * | | | Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' | Dmitriy Zaporozhets | 2014-10-12 | 1 | -1/+13 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | Enabling markdown pipelines from gitlab Define which markdown pipelines are used in GitLab from application instead from gem. See merge request !1164 | ||||
| | * | | Make sure relative url and asset_host are honored, specs. | Marin Jankovski | 2014-10-10 | 1 | -1/+13 |
| | |/ | |||||
| * | | annotate | Valery Sizov | 2014-10-09 | 11 | -90/+89 |
| | | | |||||
| * | | Snippets: public/internal/private | Valery Sizov | 2014-10-09 | 2 | -0/+98 |
| |/ | |||||
| * | Merge branch 'improve-danger-zone' into 'master' | Dmitriy Zaporozhets | 2014-10-08 | 1 | -2/+6 |
| |\ | | | | | | | | | | | | | | | | | | | | | Improve danger zone * show transfer/remove boxes by default * ask person to type project name before transfer/remove Fixes #1347 See merge request !1161 | ||||
| | * | Improve project remove spec | Dmitriy Zaporozhets | 2014-10-08 | 1 | -2/+6 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'master' into buildbox-service | Keith Pitt | 2014-10-08 | 19 | -65/+485 |
| |\ \ | |/ | | | | | | | Conflicts: app/models/project.rb | ||||
| | * | Developers can push to wiki repo. Protected branches does not affect wiki ↵ | Dmitriy Zaporozhets | 2014-10-07 | 1 | -0/+22 |
| | | | | | | | | | | | | | repo any more Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Merge branch 'slack_integration' into 'master' | Dmitriy Zaporozhets | 2014-10-06 | 1 | -9/+25 |
| | |\ | | | | | | | | | | | | | | | | Slack integration See merge request !1151 | ||||
| | | * | Accommodate new webhook url format. | Marin Jankovski | 2014-10-06 | 1 | -0/+21 |
| | | | | |||||
| | | * | Fix slack service speck. | Marin Jankovski | 2014-10-06 | 1 | -9/+4 |
| | | | | |||||
| | * | | Merge pull request #7964 from mr-vinn/task-lists | Marin Jankovski | 2014-10-06 | 4 | -1/+150 |
| | |\ \ | | | | | | | | | Add task lists to issues and merge requests | ||||
| | | * | | Add specs for tasks | Vinnie Okada | 2014-10-05 | 4 | -1/+150 |
| | | | | | | | | | | | | | | | | | | | | | Add tests for the new task list functionality in the Markdown parser and in issues and merge requests. | ||||
| | * | | | Prevent PG::Error exception when check commit reference on commit | Dmitriy Zaporozhets | 2014-10-06 | 1 | -0/+20 |
| | | |/ | |/| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |