summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | | | |
| * | | | fixed linkKaren Carias2015-06-081-1/+1
| | | | |
| * | | | Removed link "importing to gitlab" because it's in "Documentation". ↵Karen Carias2015-06-081-8/+7
| | | | | | | | | | | | | | | | | | | | Organized links in alphabetical order.
| * | | | added link to "importing to GitLab". Also organized docs in alphabetical order.Karen Carias2015-06-081-34/+35
| | | | |
| * | | | fixed numbersKaren Carias2015-06-081-18/+18
| | | | |
| * | | | fixed numbersKaren Carias2015-06-081-5/+5
| | | | |
| * | | | fixed numbersKaren Carias2015-06-081-4/+4
| | | | |
| * | | | Added info about milestones and wiki pages not imported from BitbucketKaren Carias2015-06-081-23/+26
| | | | |
| * | | | fixed importing linkKaren Carias2015-06-081-17/+17
|/ / / /
* | | | Fix broadcast message colors to one displayed in previewDmitriy Zaporozhets2015-06-081-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-0823-52/+65
|\ \ \ \
| * \ \ \ Merge branch 'improve-navigation' into 'master'Dmitriy Zaporozhets2015-06-0823-52/+65
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitLab UI * move logout button to top right ![Screenshot_2015-06-08_16.56.13](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7de04fab52ad6b742dbea100674f9671/Screenshot_2015-06-08_16.56.13.png) * remove issue/mr title truncation on index pages. For smaller screens it allow to read complete title of issue ![Screenshot_2015-06-08_16.57.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9dcaadfba14f8561c12fcd29a2e70112/Screenshot_2015-06-08_16.57.55.png) * Improve mobile UI for several pages See merge request !783
| | * | | Properly click on user profile pictureimprove-navigationDmitriy Zaporozhets2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Fix testsDmitriy Zaporozhets2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Remove arrow to the right of project name on dashboardDmitriy Zaporozhets2015-06-082-4/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Improve UI for phonesDmitriy Zaporozhets2015-06-083-4/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Dont use fixed pixel size if form controls - its bad for mobile devicesDmitriy Zaporozhets2015-06-089-18/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Fix header for mobilesDmitriy Zaporozhets2015-06-082-5/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Dont truncate issue/mr titleDmitriy Zaporozhets2015-06-083-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Move logout buttom to top right cornerDmitriy Zaporozhets2015-06-084-18/+12
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'importing-fix' into 'master'Job van der Voort2015-06-088-9/+41
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | importing documents renewed Single commit of !1813 cc @karen See merge request !1844
| * | | fix spacing in documentJob van der Voort2015-06-081-8/+5
| | | |
| * | | importing documents renewedJob van der Voort2015-06-088-9/+44
|/ / /
* | | Merge branch 'master' into 'master'Sytse Sijbrandij2015-06-061-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Added FreeOTP to 2FA I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication. See merge request !777
View Lorry Controller Status