| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | Use heredocs. | Douwe Maan | 2015-08-20 | 1 | -95/+107 | |
| | | | | ||||||
| | | * | Add fixture_file helper. | Douwe Maan | 2015-08-20 | 5 | -21/+3 | |
| | | | | ||||||
| | | * | Removed unused fixtures. | Douwe Maan | 2015-08-20 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Merge branch 'master' into reply-by-email | Douwe Maan | 2015-08-20 | 3 | -238/+4 | |
| | | |\ | ||||||
| | | * | | Test Gitlab::Email::Receiver. | Douwe Maan | 2015-08-20 | 1 | -0/+135 | |
| | | | | | ||||||
| | | * | | Test Email::AttachmentUploader. | Douwe Maan | 2015-08-20 | 2 | -1/+27 | |
| | | | | | ||||||
| | | * | | Extract ReplyParser and AttachmentUploader from Receiver. | Douwe Maan | 2015-08-20 | 2 | -481/+191 | |
| | | | | | ||||||
| | | * | | Start on tests. | Douwe Maan | 2015-08-19 | 1 | -0/+481 | |
| | | | | | ||||||
| | | * | | Test Gitlab::ReplyByEmail. | Douwe Maan | 2015-08-19 | 1 | -0/+86 | |
| | | | | | ||||||
| | * | | | Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550 | Robert Speicher | 2015-08-20 | 1 | -0/+10 | |
| | | |/ | |/| | ||||||
| * | | | Issue #993: Fixed login failure when extern_uid changes | Joel Koglin | 2015-08-21 | 1 | -0/+22 | |
| |/ / | ||||||
| * | | Merge branch 'remove-satellites' | Dmitriy Zaporozhets | 2015-08-19 | 3 | -238/+4 | |
| |\ \ | |/ |/| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | Merge branch 'master' into remove-satellites | Dmitriy Zaporozhets | 2015-08-17 | 1 | -1/+1 | |
| | |\ | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 3 | -224/+4 | |
| | | | | | | | | | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | |||||
| * | | | Merge branch 'fix-authhash-infinite-loop' into 'master' | Robert Speicher | 2015-08-18 | 1 | -4/+0 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fix infinite loop when SAML was incorrectly configured. See merge request !1170 | |||||
| | * | | | Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loop | Douwe Maan | 2015-08-17 | 1 | -4/+0 | |
| | | |/ | |/| | ||||||
| * | | | Merge branch 'mr-source-branch-clear-cache' into 'master' | Dmitriy Zaporozhets | 2015-08-18 | 1 | -0/+14 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 See merge request !1160 | |||||
| | * | | | Clear cache to prevent listing deleted branches after MR removes source branch | Stan Hu | 2015-08-14 | 1 | -0/+14 | |
| | |/ / | | | | | | | | | | Closes #2272 | |||||
| * | | | Merge branch 'fix-backslashes-inline-diff' into 'master' | Douwe Maan | 2015-08-17 | 1 | -0/+39 | |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where backslashes in inline diffs could be dropped This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input: ``` input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip ``` The second backslash is dropped in the second `sub` statement:  With this fix, it looks like:  Closes #2253 See merge request !1143 | |||||
| | * | | Fix bug where backslashes in inline diffs could be dropped | Stan Hu | 2015-08-11 | 1 | -0/+39 | |
| | |/ | | | | | | | Closes #2253 | |||||
| * | | markup_helper: detect .mkd and .mkdn as markdown | Ben Boeckel | 2015-08-12 | 1 | -1/+1 | |
| |/ | ||||||
| * | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 3 | -4/+224 | |
| | | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Merge branch 'rs-reference-data-attrs' into 'master' | Robert Speicher | 2015-08-10 | 7 | -0/+64 | |
| |\ | | | | | | | | | | | | | Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110 | |||||
| | * | Add `data-[type]-id` attribute to reference linksrs-reference-data-attrs | Robert Speicher | 2015-08-08 | 7 | -0/+64 | |
| | | | | | | | | | This is to let us redact them later in another filter. | |||||
| * | | Add `Group#add_*` convenience methodsrs-group-convenience-methods | Robert Speicher | 2015-08-07 | 1 | -1/+1 | |
| |/ | | | | Encapsulates the logic for `Gitlab::Access::WHATEVER` levels. | |||||
| * | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master' | Douwe Maan | 2015-08-06 | 1 | -0/+10 | |
| |\ | | | | | | | | | | | | | | | | | Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084 | |||||
| | * | Fix "Network" and "Graphs" pages for branches with encoded slashes | Stan Hu | 2015-08-02 | 1 | -0/+10 | |
| | | | | | | | | | Closes #1359 | |||||
| * | | Merge branch 'drop-satellites' | Dmitriy Zaporozhets | 2015-08-05 | 3 | -224/+4 | |
| |\ \ | ||||||
| | * | | Improve tests to use real branches in merge requests | Dmitriy Zaporozhets | 2015-08-04 | 1 | -4/+4 | |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Merge branch 'master' into drop-satellites | Dmitriy Zaporozhets | 2015-08-04 | 2 | -0/+17 | |
| | |\ \ | | |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Remove satellites | Dmitriy Zaporozhets | 2015-07-15 | 2 | -220/+0 | |
| | | | | ||||||
| * | | | Revert "Update noteable after a new note is added"revert_touch | Valery Sizov | 2015-08-05 | 1 | -4/+0 | |
| | |/ |/| | | | | | This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78. | |||||
| * | | Add spec to RelativeLinkFilter for Unicode filenames | Robert Speicher | 2015-07-30 | 1 | -0/+16 | |
| | | | ||||||
| * | | GoogleCode importer: Do not care about casing of image file extensions | Sven Strickroth | 2015-07-20 | 1 | -0/+1 | |
| |/ | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | |||||
| * | Extract the longest-matching ref from a commit path when multiple matches occur | Stan Hu | 2015-07-01 | 1 | -2/+9 | |
| | | | | | Closes #1839 | |||||
| * | Merge branch 'master' into rubocop-for-tests | Dmitriy Zaporozhets | 2015-06-23 | 15 | -103/+145 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb | |||||
| | * | Fix Gitlab::OAuth::User specrs-rspec3 | Robert Speicher | 2015-06-22 | 1 | -37/+48 | |
| | | | ||||||
| | * | Change `to_not` calls to `not_to` | Robert Speicher | 2015-06-22 | 5 | -10/+10 | |
| | | | | | | | | | Both work, but now we're consistent across the entire app. | |||||
| | * | Fix `raise_error` without an argument deprecation warnings | Robert Speicher | 2015-06-22 | 3 | -4/+4 | |
| | | | ||||||
| | * | Update mock and stub syntax for specs | Robert Speicher | 2015-06-22 | 8 | -53/+84 | |
| | | | ||||||
| * | | Fix Style/IndentationWidth cop violations | Stan Hu | 2015-06-22 | 3 | -5/+5 | |
| | | | ||||||
| * | | Fix Style/CaseIndentation cop violations | Stan Hu | 2015-06-22 | 1 | -10/+10 | |
| | | | ||||||
| * | | Fix Style/AlignHash cop violations | Stan Hu | 2015-06-22 | 2 | -6/+15 | |
| | | | ||||||
| * | | Fix Style/Blocks cop violations | Robert Speicher | 2015-06-22 | 11 | -76/+84 | |
| | | | ||||||
| * | | Fix Style/SpaceInsideHashLiteralBraces cop violations | Robert Speicher | 2015-06-22 | 6 | -10/+10 | |
| | | | | | | | | | These fixes were performed automatically by Rubocop's `-a` flag. | |||||
| * | | Fix Style/TrailingBlankLines cop violations | Robert Speicher | 2015-06-22 | 2 | -3/+0 | |
| | | | ||||||
| * | | Fix Style/IndentationConsistency cop violations | Robert Speicher | 2015-06-22 | 1 | -3/+1 | |
| | | | ||||||
| * | | Remove unnecessary whitespace between let and ( | Dmitriy Zaporozhets | 2015-06-22 | 2 | -2/+2 | |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Add init test for ProjectSearchResults | Stan Hu | 2015-06-18 | 1 | -0/+23 | |
| | | | | | See: https://github.com/gitlabhq/gitlabhq/pull/9368#issuecomment-110350335 | |||||
| * | Fix behavior of ldap_person method in Gitlab::OAuth::User | Alex Lossent | 2015-06-17 | 1 | -46/+56 | |
| | | | | | | Code tweaks in 45e9150a caused the ldap_person method to not return expected results. Improved tests to cover the ldap_person method, which was previously stubbed. | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |