| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Version 6.7.5.v6.7.56-7-stable | Marin Jankovski | 2014-04-14 | 1 | -1/+1 |
| | | |||||
| * | Fix emails on push service when a single commit is pushed | Jonathan A. Sternberg | 2014-04-14 | 3 | -2/+41 |
| | | | | | | Conflicts: CHANGELOG | ||||
| * | Version to 6.7.4.v6.7.4 | Marin Jankovski | 2014-04-10 | 2 | -1/+4 |
| | | |||||
| * | Don't send an email for "mentioned in" notes | Pierre de La Morinerie | 2014-04-10 | 2 | -0/+9 |
| | | | | | | | | | | | | | | | | | Currently, an email is sent every time a mentionable is referenced by an issue, a commit or a merge request: if I comment "This MR is related to #5", watchers get one email for the comment, and another one stating "Issue #5 was mentioned by issue #13". This is annoying — but the biggest issue is when pushing an existing branch. Every issue referenced by commit messages in this branch will get a new mention (which is fine), and dozens of emails will be sent for all these new mentions (which is not). This commit fixes the spam by avoiding to send an email when a new mention is created. In most cases the email notification for the mentioner is enough. | ||||
| * | Revert "Merge pull request #6720 from thmo/6-7-stable" | Marin Jankovski | 2014-04-10 | 1 | -2/+2 |
| | | | | | | This reverts commit e6707f6f278352d7ca63d9c0a3a3780e6c97be42, reversing changes made to f88d30fac86b317248dbb47e01b050d9c1edbadf. | ||||
| * | Merge pull request #6720 from thmo/6-7-stable | Dmitriy Zaporozhets | 2014-04-08 | 1 | -2/+2 |
| |\ | | | | | Fix avatars in the network graph for relative-url setups. | ||||
| | * | Fix avatars in the network graph for relative-url setups. | Thomas Moschny | 2014-04-07 | 1 | -2/+2 |
| |/ | |||||
| * | Bump version to 6.7.3, update changelog.v6.7.3 | Marin Jankovski | 2014-04-03 | 2 | -1/+2 |
| | | |||||
| * | Merge branch 'patch/6-7-2' into '6-7-stable' | Marin Jankovski | 2014-04-03 | 9 | -12/+51 |
| |\ | | | | | | | 6.7.3 patch release | ||||
| | * | Use current_user for Notification#merge_mr | Dmitriy Zaporozhets | 2014-04-02 | 3 | -4/+4 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Update CHANGELOG for 6.7.2 | Jacob Vosmaer | 2014-04-01 | 1 | -0/+1 |
| | | | |||||
| | * | Drop all tables before restoring a PostgreSQL DB | Jacob Vosmaer | 2014-04-01 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | Invoking 'db:schema:load' turned out to be a bad idea: when downgrading an existing GitLab installation, the schema of the newer version would be preserved when trying to import the old version. Conflicts: CHANGELOG | ||||
| | * | Add a rake task that drops all tables | Jacob Vosmaer | 2014-04-01 | 1 | -0/+10 |
| | | | |||||
| | * | Fix the merge notification email not being sent | Pierre de La Morinerie | 2014-04-01 | 4 | -6/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | The 'author_id_of_changes' attribute is not persisted in the database. As we retrieve the merge request from the DB just before sending the email, this attribute was always nil. Also there was no tests for the merge notification code - tests have been added. Fix #6605 | ||||
| * | | Do not require modernizr. | Marin Jankovski | 2014-04-03 | 1 | -1/+0 |
| | | | | | | | | | | | Conflicts: app/assets/javascripts/main.js.coffee | ||||
| * | | Remove modernizr gem. | Marin Jankovski | 2014-04-03 | 2 | -4/+0 |
| |/ | |||||
| * | Version 6.7.2v6.7.2 | Dmitriy Zaporozhets | 2014-03-21 | 2 | -1/+4 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix upgrader | Dmitriy Zaporozhets | 2014-03-21 | 1 | -0/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Version 6.7.1v6.7.1 | Dmitriy Zaporozhets | 2014-03-21 | 2 | -1/+4 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix gitlab-ci integration | Dmitriy Zaporozhets | 2014-03-21 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'update-install-doc-branch' into '6-7-stable' | Dmitriy Zaporozhets | 2014-03-21 | 1 | -1/+1 |
| |\ | | | | | | | | | | | Update Install Doc Branch /cc @marin | ||||
| | * | Should be 6-7. | dosire | 2014-03-21 | 1 | -1/+1 |
| | | | |||||
| * | | Version 6.7.0v6.7.0 | Marin Jankovski | 2014-03-21 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'what-is-a-bug' into 'master' | Sytse Sijbrandij | 2014-03-21 | 3 | -9/+10 |
| |\ \ | | | | | | | | | | What Is A Bug | ||||
| | * | | Ensure I can link to this line. | dosire | 2014-03-21 | 1 | -1/+4 |
| | | | | |||||
| | * | | Features people are missing are not bugs. | dosire | 2014-03-21 | 3 | -9/+7 |
| | |/ | |||||
| * | | Merge branch 'fix-grack-auth' into 'master' | Dmitriy Zaporozhets | 2014-03-21 | 2 | -26/+38 |
| |\ \ | | | | | | | | | | Fix http clone for public project | ||||
| | * | | Fix http clone for public project | Dmitriy Zaporozhets | 2014-03-21 | 2 | -26/+38 |
| |/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'update_upgrade_document' into 'master' | Dmitriy Zaporozhets | 2014-03-21 | 3 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | Update Upgrade Document for 6.7 Use the latest version of gitlab-shell which is 1.9.0 | ||||
| | * | | Use the latest tag, 1.9.1 for gitlab-shell. | Marin Jankovski | 2014-03-21 | 3 | -3/+3 |
| | | | | |||||
| | * | | Checkout gitlab-shell v 1.9.0 | Marin Jankovski | 2014-03-21 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'dmedvinsky-username-keys-content-type' | Dmitriy Zaporozhets | 2014-03-21 | 3 | -1/+12 |
| |\ \ | |||||
| | * \ | Merge branch 'username-keys-content-type' of ↵ | Dmitriy Zaporozhets | 2014-03-21 | 3 | -1/+12 |
| | |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | ||||
| | * | | Fix `/:username.keys` response content type | Dmitry Medvinsky | 2014-03-20 | 3 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently this method responds with `text/html`. It is kind of unusable if you open it in a browser. The browser thinks it is HTML and renders it as HTML, meaning new lines are dropped. So it's very hard to distinguish where the key starts and where it ends. This commit changes the content type header to `text/plain`. | ||||
| * | | | Merge branch 'gitlab_emoji_gem' into 'master' | Dmitriy Zaporozhets | 2014-03-20 | 8 | -11/+14 |
| |\ \ \ | |/ / |/| | | | | | Replace gemoji with open source PhantomOpenEmoji | ||||
| | * | | Update Changelog | Marin Jankovski | 2014-03-20 | 3 | -3/+4 |
| | | | | |||||
| | * | | New bindings to vote on notes. | Marin Jankovski | 2014-03-20 | 1 | -2/+4 |
| | | | | |||||
| | * | | Use new gems methods. | Marin Jankovski | 2014-03-20 | 4 | -6/+3 |
| | | | | |||||
| | * | | Use gitlab_emoji gem instead of gemoji. | Marin Jankovski | 2014-03-20 | 2 | -3/+6 |
| |/ / | |||||
| * | | Merge branch 'cloud-update' into 'master' | Dmitriy Zaporozhets | 2014-03-20 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | Cloud Update /cc @jacobvosmaer @marin @job | ||||
| | * | | Run the RC on Cloud. | dosire | 2014-03-19 | 1 | -3/+3 |
| | |/ | |||||
| * | | Merge branch 'oauth-require-public-email' into 'master' | Dmitriy Zaporozhets | 2014-03-20 | 1 | -1/+3 |
| |\ \ | | | | | | | | | | | | | | | | Oauth Require Public Email Does not fix #976 yet, but will reduce the amount of users getting 422 immensly. | ||||
| | * | | line break | Job van der Voort | 2014-03-19 | 1 | -0/+1 |
| | | | | |||||
| | * | | require public email with oauth provider message | Job van der Voort | 2014-03-19 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge branch 'deploy-key-doc' into 'master' | Dmitriy Zaporozhets | 2014-03-20 | 1 | -0/+12 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Deploy Key Doc /cc @marin @job @jacobvosmaer | ||||
| | * | | | Split up the lines for Jacob. | dosire | 2014-03-18 | 1 | -3/+8 |
| | | | | | |||||
| | * | | | Deploy key needed documentation. | dosire | 2014-03-18 | 1 | -0/+7 |
| | | |/ | |/| | |||||
| * | | | GitLab requires gitlab-shell v1.9.0 | Dmitriy Zaporozhets | 2014-03-20 | 2 | -1/+3 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Merge branch 'changelog_oreilly' into 'master' | Sytse Sijbrandij | 2014-03-20 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Changelog O'Reilly added "Better API for access_levels" sponsorship from O'Reilly to CHANGELOG | ||||
| | * | | | added OReilly sponsorship to CHANGELOG | Marc Radulescu | 2014-03-20 | 1 | -0/+1 |
| |/ / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |