summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix "Acount" typo in 2FA docsrs-issue-1758Robert Speicher2015-06-101-3/+3
| | | | [ci skip]
* Update grids for 2FA detailsRobert Speicher2015-06-101-6/+7
| | | | Also adds a link to the documentation.
* Merge branch 'fix-project-edit' into 'master'Dmitriy Zaporozhets2015-06-101-17/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project edit form Properly align checkboxes according to bootstrap Before: ![Screenshot_2015-06-10_17.01.26](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2e874cc0a6edd52d98a17030f3d16f24/Screenshot_2015-06-10_17.01.26.png) After: ![Screenshot_2015-06-10_16.59.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d91ffe8e981f9bc57d9a18ce8ac79e2/Screenshot_2015-06-10_16.59.31.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !793
| * Improve project edit formDmitriy Zaporozhets2015-06-101-17/+25
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-pre-rspec-3' into 'master'Dmitriy Zaporozhets2015-06-1020-56/+50
|\ | | | | | | | | | | | | | | Changes back-ported from rspec3 branch This is just breaking up the large `road-to-rspec-3` branch a bit. Each of these commits have been cherry-picked and would be good to have in place before the upgrade. See merge request !792
| * Fix taskable requirers-pre-rspec-3Robert Speicher2015-06-101-0/+1
| |
| * Fix shoulda-matchers requireRobert Speicher2015-06-102-1/+2
| |
| * Use stub_const to stub constants instead of redefining themRobert Speicher2015-06-101-2/+1
| | | | | | | | They're called constants for a reason, after all.
| * Memoize result of JSON.parse in json_responseRobert Speicher2015-06-101-1/+1
| | | | | | | | | | This might see a minor speedup in test cases that call this method many times.
| * Add `respond_to_missing?` for Commit and RepositoryRobert Speicher2015-06-102-8/+4
| | | | | | | | | | | | | | As of Ruby 1.9, this is the correct way to handle `respond_to?` for methods implemented by `method_missing`. See https://robots.thoughtbot.com/always-define-respond-to-missing-when-overriding
| * Add spec/support files for WebMock and test coverageRobert Speicher2015-06-103-12/+12
| |
| * Define GITORIOUS_HOST only onceRobert Speicher2015-06-103-4/+5
| |
| * "expect { }.not_to raise_error" no longer takes a specific classRobert Speicher2015-06-101-6/+2
| |
| * ensure_length_of -> validate_length_ofRobert Speicher2015-06-106-11/+11
| |
| * Bump shoulda-matchers and webmock gem versionsRobert Speicher2015-06-102-12/+12
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-106-20/+78
|\ \
| * \ Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-06-105-17/+74
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | update fog to 1.25.0 and add multipart upload support This merge will fix backup uploading problems to s3, closing gitlab-org/gitlab-ce#1059 See merge request !789
| | * | use gitlab not gitlabciJeroen Nijhof2015-06-091-1/+1
| | | |
| | * | remove extra spaceJeroen Nijhof2015-06-091-1/+0
| | | |
| | * | update fog to 1.25.0 and add multipart upload supportJeroen Nijhof2015-06-095-17/+75
| | | |
| * | | Merge branch 'bump-browser-gem-version-for-ie11' into 'master'Robert Schilling2015-06-103-3/+4
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update browser gem to version 0.8.0 Internet Explorer 11.0.9600.17633 has a new User-Agent string (tested using [BrowserStack](https://www.browserstack.com)): ``` User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko ``` This is supported in v0.8.0 of the browser gem: https://github.com/fnando/browser/commit/aab7a81d94cc2c31c4b860fa4a9b9a361adf1bab Closes #1775 See merge request !791
| | * | Update browser gem to version 0.8.0 for IE11 supportStan Hu2015-06-093-3/+4
| |/ / | | | | | | | | | Closes #1775
* | | Merge branch 'fixing-links' into 'master'Job van der Voort2015-06-101-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed links @job I am trying to fix these links, since they work on the commit, but then they didn't work on the website when the commit was merged. I tried changing them here, but I'm not sure if they'll work when merged. I tried to use localhost to test this, but it only works with www-gitlab-com Thanks! See merge request !1849
| * | | fixed linksKaren Carias2015-06-101-6/+6
|/ / /
* | | Merge branch 'release-time' into 'master'Sytse Sijbrandij2015-06-091-1/+6
|\ \ \ | |/ / |/| | | | | | | | | | | set the release time See merge request !1843
| * | update with suggestionsJob van der Voort2015-06-081-1/+3
| | |
| * | set the release timeJob van der Voort2015-06-081-1/+4
| | |
* | | Merge branch 'move_project_members_link' into 'master'Dmitriy Zaporozhets2015-06-097-15/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Project Members link from Settings to main menu. Addresses #2278. See merge request !1846
| * | | Move Project Members link from Settings to main menu.Nicolas2015-06-097-15/+21
| | | | | | | | | | | | | | | | Addresses #2278.
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-093-1/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ldap-remember-me' into 'master'Dmitriy Zaporozhets2015-06-093-1/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Remember me" checkbox to LDAP signin form. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2127. See merge request !772
| | * | | Add "Remember me" checkbox to LDAP signin form.ldap-remember-meDouwe Maan2015-06-053-1/+7
| | | | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-06-091-1/+5
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9373 from gitlabhq/revert-9368-patch-1Douwe Maan2015-06-091-1/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | | Revert "No need to check if `repository_ref` is present"
| | * | | | Revert "No need to check if `repository_ref` is present"Jeroen van Baarsen2015-06-091-1/+5
| |/ / / /
* | | | | Merge branch 'fix_edit_notes_form_hotkey_issue' into 'master'Douwe Maan2015-06-091-5/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make submit hotkey available to all notes forms. Addresses #2221. See merge request !1847
| * | | | Make submit hotkey available to all notes forms.Nicolas2015-06-091-5/+3
| | |/ / | |/| | | | | | | | | | Addresses #2221.
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-096-7/+32
|\ \ \ \
| * \ \ \ Merge branch 'fix-missing-js' into 'master'Dmitriy Zaporozhets2015-06-093-4/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move page-specific JS out of head and into body. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2375. See merge request !787
| | * | | | Move page-specific JS out of head and into body.Douwe Maan2015-06-093-4/+5
| | | | | |
| * | | | | Merge branch 'rs-issue-1778' into 'master'Dmitriy Zaporozhets2015-06-092-3/+26
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly remove already-mentioned commits for cross references Fixes #1778 See merge request !785
| | * | | | Correctly remove already-mentioned commits for cross referencesrs-issue-1778Robert Speicher2015-06-082-3/+26
| | |/ / / | | | | | | | | | | | | | | | Fixes #1778
| * | | | Merge branch 'master' into 'master'Job van der Voort2015-06-091-0/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added line about adding docs in alphabetical order I believe it's important to be organized when adding documentation, so whenever it applies, I believe documents should be added in alphabetical order. See merge request !786
| | * | | Added line about adding docs in alphabetical orderKaren2015-06-081-0/+1
| | | | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-06-091-5/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9368 from zenati/patch-1Jeroen van Baarsen2015-06-091-5/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | No need to check if `repository_ref` is present
| | * | | | No need to check if `repository_ref` is presentzenati2015-06-081-5/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to check if `repository_ref` is present as: ``` @repository_ref = if repository_ref.present? repository_ref else nil end ``` is as same as doing: ``` @repository_ref = repository_ref ```
* | | | | Merge branch 'fixing_importing_doc' into 'master'Job van der Voort2015-06-094-92/+95
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing importing doc Fixed some details about the importing links and documents. - Added extra info to Bitbucket importing - Organized docs in alphabetical order - Moved Importing link to general documentation, instead of workflow (that's where Sytse asked me to add it) Thank you @job for merging previous changes. See merge request !1845
| * | | | fixed linkKaren Carias2015-06-081-1/+1
| | | | |
| * | | | fixed linkKaren Carias2015-06-080-0/+0
| | | | |
View Lorry Controller Status